[freenet-cvs] r13652 - in trunk/apps/jfcp: . src/org/freenet/contrib/fcp src/org/freenet/contrib/fcp/event src/org/freenet/contrib/fcp/message src/org/freenet/contrib/fcp/message/client src/org/freenet/contrib/fcp/message/node src/org/freenet/contrib/fcp/peer test/org/freenet/contrib/fcp

[email protected] Tue, 19 Jun 2007 09:49:26 +0000 (UTC)

Author: tullyvey
Date: 2007-06-19 09:49:26 +0000 (Tue, 19 Jun 2007)
New Revision: 13652


Added:
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/FcpMessage.java
   
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientPutDiskDir.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/
   
trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/LastRoutingBackoffReason.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/PeerMetaData.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/PeerVolatileData.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/Status.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/package.html
Removed:
   trunk/apps/jfcp/junit1616536413.properties
   trunk/apps/jfcp/junit1753007685.properties
   trunk/apps/jfcp/junit288002031.properties
   trunk/apps/jfcp/junit588255481.properties
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/FcpMessage.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerMetaData.java
   
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerVolatileData.java
Modified:
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/FcpConnection.java
   
trunk/apps/jfcp/src/org/freenet/contrib/fcp/event/FcpPeerListUpdatedEvent.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientGet.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientHello.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientMessage.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientPut.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/GenerateSSK.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ListPeerNotes.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ListPeers.java
   
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ModifyPeerNote.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ShutDown.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/AllData.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/DataFound.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/EndListPeers.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/GetFailed.java
   
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/IdentifierCollision.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/NodeHello.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/NodeMessage.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/Peer.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerNote.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PersistentPut.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/SSKKeypair.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/SimpleProgress.java
   trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/URIGenerated.java
   trunk/apps/jfcp/test/org/freenet/contrib/fcp/FreenetClientTest.java
Log:
Refactored to make the fireEvents method of messages protected and to separate 
some handling of peer data.  Also more comments

Deleted: trunk/apps/jfcp/junit1616536413.properties
===================================================================
--- trunk/apps/jfcp/junit1616536413.properties  2007-06-18 18:19:30 UTC (rev 
13651)
+++ trunk/apps/jfcp/junit1616536413.properties  2007-06-19 09:49:26 UTC (rev 
13652)
@@ -1,229 +0,0 @@
-#Ant JUnitTask generated properties file
-#Mon Jun 18 18:36:30 BST 2007
-libs.jaxws20.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/FastInfoset.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/http.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxb-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-xjc.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxws-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxws-rt.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxws-tools.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr173_api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr181-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jsr250-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/saaj-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/saaj-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/sjsxp.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/stax-ex.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/streambuffer.jar
-default.javac.source=1.6
-file.encoding.pkg=sun.io
-env-gdmsession=gnome
-javac.source=1.5
-netbeans.system_http_proxy=DIRECT
-libs.jaxrpc16.src=
-java.home=/usr/lib/jvm/java-6-sun-1.6.0.00/jre
-test.src.dir=test
-javadoc.version=false
-Env-USERNAME=ralph
-env-desktop_session=gnome
-libs.CopyLibs.classpath=/home/ralph/netbeans-5.5.1/ide7/ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
-env-gnome_keyring_socket=/tmp/keyring-yqJoUo/socket
-java.endorsed.dirs=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/endorsed
-nbplatform.default.harness.dir=/home/ralph/netbeans-5.5.1/harness
-src.dir=src
-build.sysclasspath=ignore
-have.sources=true
-sun.os.patch.level=unknown
-java.vendor.url=http\://java.sun.com/
-Env-SSH_AUTH_SOCK=/tmp/ssh-hoEFXf5479/agent.5479
-java.version=1.6.0
-Env-GNOME_KEYRING_SOCKET=/tmp/keyring-yqJoUo/socket
-libs.jsf.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-beanutils.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-collections.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-digester.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-logging.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/jsf-api.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/jsf-impl.jar
-Env-SESSION_MANAGER=local/ralph-desktop\:/tmp/.ICE-unix/5479
-javac.debug=true
-org.openide.major.version=IDE/1
-run.classpath=\:build/classes
-java.vendor.url.bug=http\://java.sun.com/cgi-bin/bugreport.cgi
-env-gtk_rc_files=/etc/gtk/gtkrc\:/home/ralph/.gtkrc-1.2-gnome2
-wsclientuptodate.classpath=/home/ralph/netbeans-5.5.1/enterprise3/ant/extra/wsclientuptodate.jar
-libs.absolutelayout.javadoc=
-netbeans.buildnumber=200704122300
-user.name=ralph
-sun.io.unicode.encoding=UnicodeLittle
-sun.jnu.encoding=UTF-8
-java.runtime.name=Java(TM) SE Runtime Environment
-env-display=\:0.0
-jdk.home=/usr/lib/jvm/java-6-sun-1.6.0.00
-jspc.classpath=/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/servlet2.5-jsp2.1-api.jar\:${j2ee.platform.classpath}\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/glassfish-jspparser.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/glassfish-logging.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/commons-logging-1.0.4.jar
-Env-PATH=/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games
-org.openide.TopManager=org.netbeans.core.NonGui
-netbeans.dirs=/home/ralph/netbeans-5.5.1/bin/../nb5.5\:/home/ralph/netbeans-5.5.1/bin/../ide7\:/home/ralph/netbeans-5.5.1/bin/../enterprise3\:/home/ralph/netbeans-5.5.1/bin/../harness\:
-java.specification.name=Java Platform API Specification
-javadoc.author=false
-env-logname=ralph
-user.timezone=GB-Eire
-netbeans.system_http_non_proxy_hosts=
-path.separator=\:
-libs.junit.javadoc=/home/ralph/netbeans-5.5.1/ide7/docs/junit-3.8.1-api.zip
-ant.file.FreenetClient-impl=/stuff/java/netbeans_projects/FreenetClient/nbproject/build-impl.xml
-org.openide.specification.version=6.2
-env-session_manager=local/ralph-desktop\:/tmp/.ICE-unix/5479
-libs.absolutelayout.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/AbsoluteLayout.jar
-libs.jaxrpc16.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/FastInfoset.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jax-qname.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxp-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-spi.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jsr173_api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/mail.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/relaxngDatatype.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/saaj-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/saaj-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/xsdlib.jar
-netbeans.accept_license_class=org.netbeans.license.AcceptLicense
-dist.javadoc.dir=dist/javadoc
-file.encoding=UTF-8
-Env-SHELL=/bin/bash
-https.nonProxyHosts=localhost|127.0.0.1|ralph-desktop
-Env-DISPLAY=\:0.0
-libs.junit.src=
-Env-PWD=/home/ralph
-Env-GTK_RC_FILES=/etc/gtk/gtkrc\:/home/ralph/.gtkrc-1.2-gnome2
-ant.file=/stuff/java/netbeans_projects/FreenetClient/build.xml
-copyfiles.classpath=/home/ralph/netbeans-5.5.1/enterprise3/ant/extra/copyfiles.jar
-Env-AWT_TOOLKIT=MToolkit
-Env-LOGNAME=ralph
-java.io.tmpdir=/tmp
-Env-USER=ralph
-build.test.results.dir=build/test/results
-user.language=en
-libs.jaxws20.src=
-line.separator=\n
-apple.laf.useScreenMenuBar=true
-libs.absolutelayout.src=
-javac.compilerargs=
-netbeans.osenv.nullsep=true
-env-xauthority=/home/ralph/.Xauthority
-jar.compress=false
-env-gnome_desktop_session_id=Default
-java.vm.info=mixed mode, sharing
-env-ssh_agent_pid=5520
-javadoc.private=false
-sun.desktop=gnome
-java.vm.specification.name=Java Virtual Machine Specification
-build.test.classes.dir=build/test/classes
-jaxws.endorsed.dir=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api
-netbeans.dynamic.classpath=/home/ralph/netbeans-5.5.1/platform6/core/org-openide-filesystems.jar\:/home/ralph/netbeans-5.5.1/platform6/core/core.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_zh_CN.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/org-netbeans-upgrader.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_pt_BR.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_zh_CN.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_ja.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_ja.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_pt_BR.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_zh_CN.jar\:/home/ralph/netbeans-5.5.1/ide7/core/org-netbeans-modules-utilities-cli.jar
-platform.active=default_platform
-env-lang=en_GB.UTF-8
-http.nonProxyHosts=localhost|127.0.0.1|ralph-desktop
-javac.includes=org/freenet/contrib/fcp/FreenetClientTest.java
-libs.jsf.src=
-Env-GNOME_DESKTOP_SESSION_ID=Default
-javadoc.encoding=
-java.awt.printerjob=sun.print.PSPrinterJob
-env-xfilesearchpath=/usr/dt/app-defaults/%L/Dt
-dist.jar=dist/FreenetClient.jar
-meta.inf.dir=src/META-INF
-libs.struts.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/antlr.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-beanutils.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-digester.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-fileupload.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-logging.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-validator.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/jakarta-oro.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/struts.jar
-netbeans.home=/home/ralph/netbeans-5.5.1/platform6
-ant.version=Apache Ant version 1.6.5 compiled on June 2 2005
-javadoc.nonavbar=false
-user.properties.file=/home/ralph/.netbeans/5.5.1/build.properties
-libs.toplink.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/toplink/toplink-essentials.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/toplink/toplink-essentials-agent.jar
-netbeans.importclass=org.netbeans.upgrade.AutoUpgrade
-https.proxyPort=
-build.generated.dir=build/generated
-netbeans.home+have.tests=true
-Env-LD_LIBRARY_PATH=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386
-env-home=/home/ralph
-os.name=Linux
-java.specification.vendor=Sun Microsystems Inc.
-run.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:build/test/classes
-libs.CopyLibs.src=
-java.vm.name=Java HotSpot(TM) Client VM
-Env-GDMSESSION=gnome
-org.openide.version=deprecated
-env-awt_toolkit=MToolkit
-Env-DBUS_SESSION_BUS_ADDRESS=unix\:abstract\=/tmp/dbus-mbhDWv1EWT,guid\=0f06b1e9915ba701005653004676b5ac
-libs.junit.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar
-java.library.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386\:/usr/java/packages/lib/i386\:/lib\:/usr/lib
-Env-SSH_AGENT_PID=5520
-libs.toplink.javadoc=
-ant.java.version=1.5
-env-ld_library_path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386
-java.class.version=50.0
-basedir=/stuff/java/netbeans_projects/FreenetClient
-javadoc.noindex=false
-sun.awt.exception.handler=org.netbeans.core.NbErrorManager$AWTHandler
-javac.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar
-ant.home=/home/ralph/netbeans-5.5.1/ide7/ant
-javadoc.splitindex=true
-libs.toplink.src=
-javadoc.preview=true
-env-pwd=/home/ralph
-libs.CopyLibs.javadoc=
-libs.jaxws20.javadoc=
-env-shell=/bin/bash
-Env-GDM_XSERVER_LOCATION=local
-sun.boot.library.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386
-build.dir=build
-sun.management.compiler=HotSpot Client Compiler
-java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment
-libs.jaxb20.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxb-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-xjc.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr173_api.jar
-javadoc.windowtitle=Freenet Client Javadocs
-http.proxyPort=
-https.proxyHost=
-libs.jstl11.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/javaee5-doc-api.zip
-netbeans.osenv=/tmp/nbenv.5853
-run.jvmargs=
-build.compiler.emacs=true
-libs.jstl11.src=
-ant.project.name=FreenetClient
-libs.swing-layout.classpath=/home/ralph/netbeans-5.5.1/platform6/modules/ext/swing-layout-1.0.jar
-java.vm.specification.version=1.0
-work.dir=/stuff/java/netbeans_projects/FreenetClient
-awt.toolkit=sun.awt.motif.MToolkit
-Env-XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt
-javadoc.use=true
-sun.cpu.isalist=
-java.ext.dirs=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/ext\:/usr/java/packages/lib/ext
-os.version=2.6.20-16-generic
-libs.jstl11.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/standard.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jstl.jar
-user.home=/home/ralph
-org.xml.sax.driver=com.sun.org.apache.xerces.internal.jaxp.SAXParserImpl$JAXPSAXParser
-java.vm.vendor=Sun Microsystems Inc.
-javax.xml.parsers.DocumentBuilderFactory=org.netbeans.core.startup.DOMFactoryImpl
-libs.struts.src=
-user.dir=/home/ralph
-org.openide.TopManager.GUI=true
-libs.jaxb20.javadoc=
-env-username=ralph
-libs.jsf.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/javaee5-doc-api.zip
-application.args=
-ant.file.FreenetClient=/stuff/java/netbeans_projects/FreenetClient/build.xml
-env-path=/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games
-sun.cpu.endian=little
-libs.jaxb20.src=
-Env-J2D_PIXMAPS=shared
-Env-LANG=en_GB.UTF-8
-java.vm.version=1.6.0-b105
-java.class.path=/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-nodeps.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-commons-logging.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-log4j.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jai.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-stylebook.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-xslp.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-antlr.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-resolver.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-xalan1.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-weblogic.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-commons-net.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jsch.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-oro.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-trax.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-icontract.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-netrexx.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-javamail.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-vaj.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-junit.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-swing.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-bcel.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-regexp.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-launcher.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jmf.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-starteam.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jdepend.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-bsf.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jsch-0.1.24.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/boot.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/org-openide-modules.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/org-openide-util.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/swing-l10n_pt_BR.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/lib/dt.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/lib/tools.jar
-javax.xml.parsers.SAXParserFactory=org.netbeans.core.startup.SAXFactoryImpl
-os.arch=i386
-http.proxyHost=
-javac.deprecation=false
-env-gdm_xserver_location=local
-nbplatform.default.netbeans.dest.dir=/home/ralph/netbeans-5.5.1
-env-nlspath=/usr/dt/lib/nls/msg/%L/%N.cat
-build.classes.excludes=**/*.java,**/*.form
-dist.dir=dist
-netbeans.user=/home/ralph/.netbeans/5.5.1
-debug.classpath=\:build/classes
-sun.java.launcher=SUN_STANDARD
-Env-XAUTHORITY=/home/ralph/.Xauthority
-env-dbus_session_bus_address=unix\:abstract\=/tmp/dbus-mbhDWv1EWT,guid\=0f06b1e9915ba701005653004676b5ac
-java.vm.specification.vendor=Sun Microsystems Inc.
-file.separator=/
-java.runtime.version=1.6.0-b105
-sun.boot.class.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/resources.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/rt.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/sunrsasign.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/jsse.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/jce.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/charsets.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/classes
-debug.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:build/test/classes
-env-user=ralph
-main.class=org.freenet.contrib.fcp.FreenetClient
-have.tests=true
-test.includes=org/freenet/contrib/fcp/FreenetClientTest.java
-Env-HOME=/home/ralph
-user.country=GB
-javadoc.notree=false
-Env-NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat
-Env-DESKTOP_SESSION=gnome
-libs.struts.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/struts-1.2.9-javadoc.zip
-javadoc.additionalparam=
-default.javac.target=1.6
-javac.classpath=
-build.classes.dir=build/classes
-libs.swing-layout.src=
-libs.swing-layout.javadoc=/home/ralph/netbeans-5.5.1/platform6/docs/swing-layout-1.0-doc.zip
-javac.target=1.5
-java.vendor=Sun Microsystems Inc.
-env-j2d_pixmaps=shared
-env-ssh_auth_sock=/tmp/ssh-hoEFXf5479/agent.5479
-libs.jaxrpc16.javadoc=
-java.specification.version=1.6
-sun.arch.data.model=32

Deleted: trunk/apps/jfcp/junit1753007685.properties
===================================================================
--- trunk/apps/jfcp/junit1753007685.properties  2007-06-18 18:19:30 UTC (rev 
13651)
+++ trunk/apps/jfcp/junit1753007685.properties  2007-06-19 09:49:26 UTC (rev 
13652)
@@ -1,229 +0,0 @@
-#Ant JUnitTask generated properties file
-#Mon Jun 18 18:35:59 BST 2007
-libs.jaxws20.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/FastInfoset.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/http.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxb-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-xjc.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxws-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxws-rt.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxws-tools.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr173_api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr181-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jsr250-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/saaj-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/saaj-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/sjsxp.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/stax-ex.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/streambuffer.jar
-default.javac.source=1.6
-file.encoding.pkg=sun.io
-env-gdmsession=gnome
-javac.source=1.5
-netbeans.system_http_proxy=DIRECT
-libs.jaxrpc16.src=
-java.home=/usr/lib/jvm/java-6-sun-1.6.0.00/jre
-test.src.dir=test
-javadoc.version=false
-Env-USERNAME=ralph
-env-desktop_session=gnome
-libs.CopyLibs.classpath=/home/ralph/netbeans-5.5.1/ide7/ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
-env-gnome_keyring_socket=/tmp/keyring-yqJoUo/socket
-java.endorsed.dirs=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/endorsed
-nbplatform.default.harness.dir=/home/ralph/netbeans-5.5.1/harness
-src.dir=src
-build.sysclasspath=ignore
-have.sources=true
-sun.os.patch.level=unknown
-java.vendor.url=http\://java.sun.com/
-Env-SSH_AUTH_SOCK=/tmp/ssh-hoEFXf5479/agent.5479
-java.version=1.6.0
-Env-GNOME_KEYRING_SOCKET=/tmp/keyring-yqJoUo/socket
-libs.jsf.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-beanutils.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-collections.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-digester.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-logging.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/jsf-api.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/jsf-impl.jar
-Env-SESSION_MANAGER=local/ralph-desktop\:/tmp/.ICE-unix/5479
-javac.debug=true
-org.openide.major.version=IDE/1
-run.classpath=\:build/classes
-java.vendor.url.bug=http\://java.sun.com/cgi-bin/bugreport.cgi
-env-gtk_rc_files=/etc/gtk/gtkrc\:/home/ralph/.gtkrc-1.2-gnome2
-wsclientuptodate.classpath=/home/ralph/netbeans-5.5.1/enterprise3/ant/extra/wsclientuptodate.jar
-libs.absolutelayout.javadoc=
-netbeans.buildnumber=200704122300
-user.name=ralph
-sun.io.unicode.encoding=UnicodeLittle
-sun.jnu.encoding=UTF-8
-java.runtime.name=Java(TM) SE Runtime Environment
-env-display=\:0.0
-jdk.home=/usr/lib/jvm/java-6-sun-1.6.0.00
-jspc.classpath=/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/servlet2.5-jsp2.1-api.jar\:${j2ee.platform.classpath}\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/glassfish-jspparser.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/glassfish-logging.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/commons-logging-1.0.4.jar
-Env-PATH=/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games
-org.openide.TopManager=org.netbeans.core.NonGui
-netbeans.dirs=/home/ralph/netbeans-5.5.1/bin/../nb5.5\:/home/ralph/netbeans-5.5.1/bin/../ide7\:/home/ralph/netbeans-5.5.1/bin/../enterprise3\:/home/ralph/netbeans-5.5.1/bin/../harness\:
-java.specification.name=Java Platform API Specification
-javadoc.author=false
-env-logname=ralph
-user.timezone=GB-Eire
-netbeans.system_http_non_proxy_hosts=
-path.separator=\:
-libs.junit.javadoc=/home/ralph/netbeans-5.5.1/ide7/docs/junit-3.8.1-api.zip
-ant.file.FreenetClient-impl=/stuff/java/netbeans_projects/FreenetClient/nbproject/build-impl.xml
-org.openide.specification.version=6.2
-env-session_manager=local/ralph-desktop\:/tmp/.ICE-unix/5479
-libs.absolutelayout.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/AbsoluteLayout.jar
-libs.jaxrpc16.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/FastInfoset.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jax-qname.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxp-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-spi.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jsr173_api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/mail.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/relaxngDatatype.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/saaj-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/saaj-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/xsdlib.jar
-netbeans.accept_license_class=org.netbeans.license.AcceptLicense
-dist.javadoc.dir=dist/javadoc
-file.encoding=UTF-8
-Env-SHELL=/bin/bash
-https.nonProxyHosts=localhost|127.0.0.1|ralph-desktop
-Env-DISPLAY=\:0.0
-libs.junit.src=
-Env-PWD=/home/ralph
-Env-GTK_RC_FILES=/etc/gtk/gtkrc\:/home/ralph/.gtkrc-1.2-gnome2
-ant.file=/stuff/java/netbeans_projects/FreenetClient/build.xml
-copyfiles.classpath=/home/ralph/netbeans-5.5.1/enterprise3/ant/extra/copyfiles.jar
-Env-AWT_TOOLKIT=MToolkit
-Env-LOGNAME=ralph
-java.io.tmpdir=/tmp
-Env-USER=ralph
-build.test.results.dir=build/test/results
-user.language=en
-libs.jaxws20.src=
-line.separator=\n
-apple.laf.useScreenMenuBar=true
-libs.absolutelayout.src=
-javac.compilerargs=
-netbeans.osenv.nullsep=true
-env-xauthority=/home/ralph/.Xauthority
-jar.compress=false
-env-gnome_desktop_session_id=Default
-java.vm.info=mixed mode, sharing
-env-ssh_agent_pid=5520
-javadoc.private=false
-sun.desktop=gnome
-java.vm.specification.name=Java Virtual Machine Specification
-build.test.classes.dir=build/test/classes
-jaxws.endorsed.dir=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api
-netbeans.dynamic.classpath=/home/ralph/netbeans-5.5.1/platform6/core/org-openide-filesystems.jar\:/home/ralph/netbeans-5.5.1/platform6/core/core.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_zh_CN.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/org-netbeans-upgrader.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_pt_BR.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_zh_CN.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_ja.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_ja.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_pt_BR.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_zh_CN.jar\:/home/ralph/netbeans-5.5.1/ide7/core/org-netbeans-modules-utilities-cli.jar
-platform.active=default_platform
-env-lang=en_GB.UTF-8
-http.nonProxyHosts=localhost|127.0.0.1|ralph-desktop
-javac.includes=org/freenet/contrib/fcp/FreenetClientTest.java
-libs.jsf.src=
-Env-GNOME_DESKTOP_SESSION_ID=Default
-javadoc.encoding=
-java.awt.printerjob=sun.print.PSPrinterJob
-env-xfilesearchpath=/usr/dt/app-defaults/%L/Dt
-dist.jar=dist/FreenetClient.jar
-meta.inf.dir=src/META-INF
-libs.struts.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/antlr.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-beanutils.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-digester.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-fileupload.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-logging.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-validator.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/jakarta-oro.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/struts.jar
-netbeans.home=/home/ralph/netbeans-5.5.1/platform6
-ant.version=Apache Ant version 1.6.5 compiled on June 2 2005
-javadoc.nonavbar=false
-user.properties.file=/home/ralph/.netbeans/5.5.1/build.properties
-libs.toplink.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/toplink/toplink-essentials.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/toplink/toplink-essentials-agent.jar
-netbeans.importclass=org.netbeans.upgrade.AutoUpgrade
-https.proxyPort=
-build.generated.dir=build/generated
-netbeans.home+have.tests=true
-Env-LD_LIBRARY_PATH=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386
-env-home=/home/ralph
-os.name=Linux
-java.specification.vendor=Sun Microsystems Inc.
-run.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:build/test/classes
-libs.CopyLibs.src=
-java.vm.name=Java HotSpot(TM) Client VM
-Env-GDMSESSION=gnome
-org.openide.version=deprecated
-env-awt_toolkit=MToolkit
-Env-DBUS_SESSION_BUS_ADDRESS=unix\:abstract\=/tmp/dbus-mbhDWv1EWT,guid\=0f06b1e9915ba701005653004676b5ac
-libs.junit.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar
-java.library.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386\:/usr/java/packages/lib/i386\:/lib\:/usr/lib
-Env-SSH_AGENT_PID=5520
-libs.toplink.javadoc=
-ant.java.version=1.5
-env-ld_library_path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386
-java.class.version=50.0
-basedir=/stuff/java/netbeans_projects/FreenetClient
-javadoc.noindex=false
-sun.awt.exception.handler=org.netbeans.core.NbErrorManager$AWTHandler
-javac.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar
-ant.home=/home/ralph/netbeans-5.5.1/ide7/ant
-javadoc.splitindex=true
-libs.toplink.src=
-javadoc.preview=true
-env-pwd=/home/ralph
-libs.CopyLibs.javadoc=
-libs.jaxws20.javadoc=
-env-shell=/bin/bash
-Env-GDM_XSERVER_LOCATION=local
-sun.boot.library.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386
-build.dir=build
-sun.management.compiler=HotSpot Client Compiler
-java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment
-libs.jaxb20.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxb-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-xjc.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr173_api.jar
-javadoc.windowtitle=Freenet Client Javadocs
-http.proxyPort=
-https.proxyHost=
-libs.jstl11.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/javaee5-doc-api.zip
-netbeans.osenv=/tmp/nbenv.5853
-run.jvmargs=
-build.compiler.emacs=true
-libs.jstl11.src=
-ant.project.name=FreenetClient
-libs.swing-layout.classpath=/home/ralph/netbeans-5.5.1/platform6/modules/ext/swing-layout-1.0.jar
-java.vm.specification.version=1.0
-work.dir=/stuff/java/netbeans_projects/FreenetClient
-awt.toolkit=sun.awt.motif.MToolkit
-Env-XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt
-javadoc.use=true
-sun.cpu.isalist=
-java.ext.dirs=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/ext\:/usr/java/packages/lib/ext
-os.version=2.6.20-16-generic
-libs.jstl11.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/standard.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jstl.jar
-user.home=/home/ralph
-org.xml.sax.driver=com.sun.org.apache.xerces.internal.jaxp.SAXParserImpl$JAXPSAXParser
-java.vm.vendor=Sun Microsystems Inc.
-javax.xml.parsers.DocumentBuilderFactory=org.netbeans.core.startup.DOMFactoryImpl
-libs.struts.src=
-user.dir=/home/ralph
-org.openide.TopManager.GUI=true
-libs.jaxb20.javadoc=
-env-username=ralph
-libs.jsf.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/javaee5-doc-api.zip
-application.args=
-ant.file.FreenetClient=/stuff/java/netbeans_projects/FreenetClient/build.xml
-env-path=/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games
-sun.cpu.endian=little
-libs.jaxb20.src=
-Env-J2D_PIXMAPS=shared
-Env-LANG=en_GB.UTF-8
-java.vm.version=1.6.0-b105
-java.class.path=/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-nodeps.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-commons-logging.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-log4j.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jai.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-stylebook.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-xslp.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-antlr.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-resolver.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-xalan1.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-weblogic.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-commons-net.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jsch.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-oro.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-trax.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-icontract.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-netrexx.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-javamail.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-vaj.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-junit.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-swing.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-bcel.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-regexp.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-launcher.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jmf.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-starteam.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jdepend.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-bsf.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jsch-0.1.24.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/boot.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/org-openide-modules.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/org-openide-util.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/swing-l10n_pt_BR.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/lib/dt.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/lib/tools.jar
-javax.xml.parsers.SAXParserFactory=org.netbeans.core.startup.SAXFactoryImpl
-os.arch=i386
-http.proxyHost=
-javac.deprecation=false
-env-gdm_xserver_location=local
-nbplatform.default.netbeans.dest.dir=/home/ralph/netbeans-5.5.1
-env-nlspath=/usr/dt/lib/nls/msg/%L/%N.cat
-build.classes.excludes=**/*.java,**/*.form
-dist.dir=dist
-netbeans.user=/home/ralph/.netbeans/5.5.1
-debug.classpath=\:build/classes
-sun.java.launcher=SUN_STANDARD
-Env-XAUTHORITY=/home/ralph/.Xauthority
-env-dbus_session_bus_address=unix\:abstract\=/tmp/dbus-mbhDWv1EWT,guid\=0f06b1e9915ba701005653004676b5ac
-java.vm.specification.vendor=Sun Microsystems Inc.
-file.separator=/
-java.runtime.version=1.6.0-b105
-sun.boot.class.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/resources.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/rt.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/sunrsasign.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/jsse.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/jce.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/charsets.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/classes
-debug.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:build/test/classes
-env-user=ralph
-main.class=org.freenet.contrib.fcp.FreenetClient
-have.tests=true
-test.includes=org/freenet/contrib/fcp/FreenetClientTest.java
-Env-HOME=/home/ralph
-user.country=GB
-javadoc.notree=false
-Env-NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat
-Env-DESKTOP_SESSION=gnome
-libs.struts.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/struts-1.2.9-javadoc.zip
-javadoc.additionalparam=
-default.javac.target=1.6
-javac.classpath=
-build.classes.dir=build/classes
-libs.swing-layout.src=
-libs.swing-layout.javadoc=/home/ralph/netbeans-5.5.1/platform6/docs/swing-layout-1.0-doc.zip
-javac.target=1.5
-java.vendor=Sun Microsystems Inc.
-env-j2d_pixmaps=shared
-env-ssh_auth_sock=/tmp/ssh-hoEFXf5479/agent.5479
-libs.jaxrpc16.javadoc=
-java.specification.version=1.6
-sun.arch.data.model=32

Deleted: trunk/apps/jfcp/junit288002031.properties
===================================================================
--- trunk/apps/jfcp/junit288002031.properties   2007-06-18 18:19:30 UTC (rev 
13651)
+++ trunk/apps/jfcp/junit288002031.properties   2007-06-19 09:49:26 UTC (rev 
13652)
@@ -1,229 +0,0 @@
-#Ant JUnitTask generated properties file
-#Mon Jun 18 19:07:15 BST 2007
-libs.jaxws20.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/FastInfoset.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/http.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxb-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-xjc.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxws-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxws-rt.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxws-tools.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr173_api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr181-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jsr250-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/saaj-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/saaj-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/sjsxp.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/stax-ex.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/streambuffer.jar
-default.javac.source=1.6
-file.encoding.pkg=sun.io
-env-gdmsession=gnome
-javac.source=1.5
-netbeans.system_http_proxy=DIRECT
-libs.jaxrpc16.src=
-java.home=/usr/lib/jvm/java-6-sun-1.6.0.00/jre
-test.src.dir=test
-javadoc.version=false
-Env-USERNAME=ralph
-env-desktop_session=gnome
-libs.CopyLibs.classpath=/home/ralph/netbeans-5.5.1/ide7/ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
-env-gnome_keyring_socket=/tmp/keyring-yqJoUo/socket
-java.endorsed.dirs=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/endorsed
-nbplatform.default.harness.dir=/home/ralph/netbeans-5.5.1/harness
-src.dir=src
-build.sysclasspath=ignore
-have.sources=true
-sun.os.patch.level=unknown
-java.vendor.url=http\://java.sun.com/
-Env-SSH_AUTH_SOCK=/tmp/ssh-hoEFXf5479/agent.5479
-java.version=1.6.0
-Env-GNOME_KEYRING_SOCKET=/tmp/keyring-yqJoUo/socket
-libs.jsf.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-beanutils.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-collections.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-digester.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-logging.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/jsf-api.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/jsf-impl.jar
-Env-SESSION_MANAGER=local/ralph-desktop\:/tmp/.ICE-unix/5479
-javac.debug=true
-org.openide.major.version=IDE/1
-run.classpath=\:build/classes
-java.vendor.url.bug=http\://java.sun.com/cgi-bin/bugreport.cgi
-env-gtk_rc_files=/etc/gtk/gtkrc\:/home/ralph/.gtkrc-1.2-gnome2
-wsclientuptodate.classpath=/home/ralph/netbeans-5.5.1/enterprise3/ant/extra/wsclientuptodate.jar
-libs.absolutelayout.javadoc=
-netbeans.buildnumber=200704122300
-user.name=ralph
-sun.io.unicode.encoding=UnicodeLittle
-sun.jnu.encoding=UTF-8
-java.runtime.name=Java(TM) SE Runtime Environment
-env-display=\:0.0
-jdk.home=/usr/lib/jvm/java-6-sun-1.6.0.00
-jspc.classpath=/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/servlet2.5-jsp2.1-api.jar\:${j2ee.platform.classpath}\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/glassfish-jspparser.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/glassfish-logging.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/commons-logging-1.0.4.jar
-Env-PATH=/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games
-org.openide.TopManager=org.netbeans.core.NonGui
-netbeans.dirs=/home/ralph/netbeans-5.5.1/bin/../nb5.5\:/home/ralph/netbeans-5.5.1/bin/../ide7\:/home/ralph/netbeans-5.5.1/bin/../enterprise3\:/home/ralph/netbeans-5.5.1/bin/../harness\:
-java.specification.name=Java Platform API Specification
-javadoc.author=false
-env-logname=ralph
-user.timezone=GB-Eire
-netbeans.system_http_non_proxy_hosts=
-path.separator=\:
-libs.junit.javadoc=/home/ralph/netbeans-5.5.1/ide7/docs/junit-3.8.1-api.zip
-ant.file.FreenetClient-impl=/stuff/java/netbeans_projects/FreenetClient/nbproject/build-impl.xml
-org.openide.specification.version=6.2
-env-session_manager=local/ralph-desktop\:/tmp/.ICE-unix/5479
-libs.absolutelayout.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/AbsoluteLayout.jar
-libs.jaxrpc16.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/FastInfoset.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jax-qname.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxp-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-spi.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jsr173_api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/mail.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/relaxngDatatype.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/saaj-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/saaj-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/xsdlib.jar
-netbeans.accept_license_class=org.netbeans.license.AcceptLicense
-dist.javadoc.dir=dist/javadoc
-file.encoding=UTF-8
-Env-SHELL=/bin/bash
-https.nonProxyHosts=localhost|127.0.0.1|ralph-desktop
-Env-DISPLAY=\:0.0
-libs.junit.src=
-Env-PWD=/home/ralph
-Env-GTK_RC_FILES=/etc/gtk/gtkrc\:/home/ralph/.gtkrc-1.2-gnome2
-ant.file=/stuff/java/netbeans_projects/FreenetClient/build.xml
-copyfiles.classpath=/home/ralph/netbeans-5.5.1/enterprise3/ant/extra/copyfiles.jar
-Env-AWT_TOOLKIT=MToolkit
-Env-LOGNAME=ralph
-java.io.tmpdir=/tmp
-Env-USER=ralph
-build.test.results.dir=build/test/results
-user.language=en
-libs.jaxws20.src=
-line.separator=\n
-apple.laf.useScreenMenuBar=true
-libs.absolutelayout.src=
-javac.compilerargs=
-netbeans.osenv.nullsep=true
-env-xauthority=/home/ralph/.Xauthority
-jar.compress=false
-env-gnome_desktop_session_id=Default
-java.vm.info=mixed mode, sharing
-env-ssh_agent_pid=5520
-javadoc.private=false
-sun.desktop=gnome
-java.vm.specification.name=Java Virtual Machine Specification
-build.test.classes.dir=build/test/classes
-jaxws.endorsed.dir=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api
-netbeans.dynamic.classpath=/home/ralph/netbeans-5.5.1/platform6/core/org-openide-filesystems.jar\:/home/ralph/netbeans-5.5.1/platform6/core/core.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_zh_CN.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/org-netbeans-upgrader.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_pt_BR.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_zh_CN.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_ja.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_ja.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_pt_BR.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_zh_CN.jar\:/home/ralph/netbeans-5.5.1/ide7/core/org-netbeans-modules-utilities-cli.jar
-platform.active=default_platform
-env-lang=en_GB.UTF-8
-http.nonProxyHosts=localhost|127.0.0.1|ralph-desktop
-javac.includes=org/freenet/contrib/fcp/FreenetClientTest.java
-libs.jsf.src=
-Env-GNOME_DESKTOP_SESSION_ID=Default
-javadoc.encoding=
-java.awt.printerjob=sun.print.PSPrinterJob
-env-xfilesearchpath=/usr/dt/app-defaults/%L/Dt
-dist.jar=dist/FreenetClient.jar
-meta.inf.dir=src/META-INF
-libs.struts.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/antlr.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-beanutils.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-digester.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-fileupload.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-logging.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-validator.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/jakarta-oro.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/struts.jar
-netbeans.home=/home/ralph/netbeans-5.5.1/platform6
-ant.version=Apache Ant version 1.6.5 compiled on June 2 2005
-javadoc.nonavbar=false
-user.properties.file=/home/ralph/.netbeans/5.5.1/build.properties
-libs.toplink.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/toplink/toplink-essentials.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/toplink/toplink-essentials-agent.jar
-netbeans.importclass=org.netbeans.upgrade.AutoUpgrade
-https.proxyPort=
-build.generated.dir=build/generated
-netbeans.home+have.tests=true
-Env-LD_LIBRARY_PATH=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386
-env-home=/home/ralph
-os.name=Linux
-java.specification.vendor=Sun Microsystems Inc.
-run.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:build/test/classes
-libs.CopyLibs.src=
-java.vm.name=Java HotSpot(TM) Client VM
-Env-GDMSESSION=gnome
-org.openide.version=deprecated
-env-awt_toolkit=MToolkit
-Env-DBUS_SESSION_BUS_ADDRESS=unix\:abstract\=/tmp/dbus-mbhDWv1EWT,guid\=0f06b1e9915ba701005653004676b5ac
-libs.junit.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar
-java.library.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386\:/usr/java/packages/lib/i386\:/lib\:/usr/lib
-Env-SSH_AGENT_PID=5520
-libs.toplink.javadoc=
-ant.java.version=1.5
-env-ld_library_path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386
-java.class.version=50.0
-basedir=/stuff/java/netbeans_projects/FreenetClient
-javadoc.noindex=false
-sun.awt.exception.handler=org.netbeans.core.NbErrorManager$AWTHandler
-javac.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar
-ant.home=/home/ralph/netbeans-5.5.1/ide7/ant
-javadoc.splitindex=true
-libs.toplink.src=
-javadoc.preview=true
-env-pwd=/home/ralph
-libs.CopyLibs.javadoc=
-libs.jaxws20.javadoc=
-env-shell=/bin/bash
-Env-GDM_XSERVER_LOCATION=local
-sun.boot.library.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386
-build.dir=build
-sun.management.compiler=HotSpot Client Compiler
-java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment
-libs.jaxb20.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxb-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-xjc.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr173_api.jar
-javadoc.windowtitle=Freenet Client Javadocs
-http.proxyPort=
-https.proxyHost=
-libs.jstl11.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/javaee5-doc-api.zip
-netbeans.osenv=/tmp/nbenv.5853
-run.jvmargs=
-build.compiler.emacs=true
-libs.jstl11.src=
-ant.project.name=FreenetClient
-libs.swing-layout.classpath=/home/ralph/netbeans-5.5.1/platform6/modules/ext/swing-layout-1.0.jar
-java.vm.specification.version=1.0
-work.dir=/stuff/java/netbeans_projects/FreenetClient
-awt.toolkit=sun.awt.motif.MToolkit
-Env-XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt
-javadoc.use=true
-sun.cpu.isalist=
-java.ext.dirs=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/ext\:/usr/java/packages/lib/ext
-os.version=2.6.20-16-generic
-libs.jstl11.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/standard.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jstl.jar
-user.home=/home/ralph
-org.xml.sax.driver=com.sun.org.apache.xerces.internal.jaxp.SAXParserImpl$JAXPSAXParser
-java.vm.vendor=Sun Microsystems Inc.
-javax.xml.parsers.DocumentBuilderFactory=org.netbeans.core.startup.DOMFactoryImpl
-libs.struts.src=
-user.dir=/home/ralph
-org.openide.TopManager.GUI=true
-libs.jaxb20.javadoc=
-env-username=ralph
-libs.jsf.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/javaee5-doc-api.zip
-application.args=
-ant.file.FreenetClient=/stuff/java/netbeans_projects/FreenetClient/build.xml
-env-path=/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games
-sun.cpu.endian=little
-libs.jaxb20.src=
-Env-J2D_PIXMAPS=shared
-Env-LANG=en_GB.UTF-8
-java.vm.version=1.6.0-b105
-java.class.path=/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-nodeps.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-commons-logging.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-log4j.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jai.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-stylebook.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-xslp.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-antlr.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-resolver.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-xalan1.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-weblogic.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-commons-net.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jsch.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-oro.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-trax.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-icontract.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-netrexx.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-javamail.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-vaj.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-junit.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-swing.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-bcel.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-regexp.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-launcher.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jmf.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-starteam.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jdepend.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-bsf.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jsch-0.1.24.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/boot.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/org-openide-modules.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/org-openide-util.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/swing-l10n_pt_BR.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/lib/dt.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/lib/tools.jar
-javax.xml.parsers.SAXParserFactory=org.netbeans.core.startup.SAXFactoryImpl
-os.arch=i386
-http.proxyHost=
-javac.deprecation=false
-env-gdm_xserver_location=local
-nbplatform.default.netbeans.dest.dir=/home/ralph/netbeans-5.5.1
-env-nlspath=/usr/dt/lib/nls/msg/%L/%N.cat
-build.classes.excludes=**/*.java,**/*.form
-dist.dir=dist
-netbeans.user=/home/ralph/.netbeans/5.5.1
-debug.classpath=\:build/classes
-sun.java.launcher=SUN_STANDARD
-Env-XAUTHORITY=/home/ralph/.Xauthority
-env-dbus_session_bus_address=unix\:abstract\=/tmp/dbus-mbhDWv1EWT,guid\=0f06b1e9915ba701005653004676b5ac
-java.vm.specification.vendor=Sun Microsystems Inc.
-file.separator=/
-java.runtime.version=1.6.0-b105
-sun.boot.class.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/resources.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/rt.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/sunrsasign.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/jsse.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/jce.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/charsets.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/classes
-debug.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:build/test/classes
-env-user=ralph
-main.class=org.freenet.contrib.fcp.FreenetClient
-have.tests=true
-test.includes=org/freenet/contrib/fcp/FreenetClientTest.java
-Env-HOME=/home/ralph
-user.country=GB
-javadoc.notree=false
-Env-NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat
-Env-DESKTOP_SESSION=gnome
-libs.struts.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/struts-1.2.9-javadoc.zip
-javadoc.additionalparam=
-default.javac.target=1.6
-javac.classpath=
-build.classes.dir=build/classes
-libs.swing-layout.src=
-libs.swing-layout.javadoc=/home/ralph/netbeans-5.5.1/platform6/docs/swing-layout-1.0-doc.zip
-javac.target=1.5
-java.vendor=Sun Microsystems Inc.
-env-j2d_pixmaps=shared
-env-ssh_auth_sock=/tmp/ssh-hoEFXf5479/agent.5479
-libs.jaxrpc16.javadoc=
-java.specification.version=1.6
-sun.arch.data.model=32

Deleted: trunk/apps/jfcp/junit588255481.properties
===================================================================
--- trunk/apps/jfcp/junit588255481.properties   2007-06-18 18:19:30 UTC (rev 
13651)
+++ trunk/apps/jfcp/junit588255481.properties   2007-06-19 09:49:26 UTC (rev 
13652)
@@ -1,229 +0,0 @@
-#Ant JUnitTask generated properties file
-#Mon Jun 18 19:03:31 BST 2007
-libs.jaxws20.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/FastInfoset.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/http.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxb-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-xjc.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxws-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxws-rt.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxws-tools.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr173_api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr181-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jsr250-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/saaj-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/saaj-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/sjsxp.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/stax-ex.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/streambuffer.jar
-default.javac.source=1.6
-file.encoding.pkg=sun.io
-env-gdmsession=gnome
-javac.source=1.5
-netbeans.system_http_proxy=DIRECT
-libs.jaxrpc16.src=
-java.home=/usr/lib/jvm/java-6-sun-1.6.0.00/jre
-test.src.dir=test
-javadoc.version=false
-Env-USERNAME=ralph
-env-desktop_session=gnome
-libs.CopyLibs.classpath=/home/ralph/netbeans-5.5.1/ide7/ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
-env-gnome_keyring_socket=/tmp/keyring-yqJoUo/socket
-java.endorsed.dirs=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/endorsed
-nbplatform.default.harness.dir=/home/ralph/netbeans-5.5.1/harness
-src.dir=src
-build.sysclasspath=ignore
-have.sources=true
-sun.os.patch.level=unknown
-java.vendor.url=http\://java.sun.com/
-Env-SSH_AUTH_SOCK=/tmp/ssh-hoEFXf5479/agent.5479
-java.version=1.6.0
-Env-GNOME_KEYRING_SOCKET=/tmp/keyring-yqJoUo/socket
-libs.jsf.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-beanutils.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-collections.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-digester.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/commons-logging.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/jsf-api.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jsf/jsf-impl.jar
-Env-SESSION_MANAGER=local/ralph-desktop\:/tmp/.ICE-unix/5479
-javac.debug=true
-org.openide.major.version=IDE/1
-run.classpath=\:build/classes
-java.vendor.url.bug=http\://java.sun.com/cgi-bin/bugreport.cgi
-env-gtk_rc_files=/etc/gtk/gtkrc\:/home/ralph/.gtkrc-1.2-gnome2
-wsclientuptodate.classpath=/home/ralph/netbeans-5.5.1/enterprise3/ant/extra/wsclientuptodate.jar
-libs.absolutelayout.javadoc=
-netbeans.buildnumber=200704122300
-user.name=ralph
-sun.io.unicode.encoding=UnicodeLittle
-sun.jnu.encoding=UTF-8
-java.runtime.name=Java(TM) SE Runtime Environment
-env-display=\:0.0
-jdk.home=/usr/lib/jvm/java-6-sun-1.6.0.00
-jspc.classpath=/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/servlet2.5-jsp2.1-api.jar\:${j2ee.platform.classpath}\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/glassfish-jspparser.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/glassfish-logging.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/commons-logging-1.0.4.jar
-Env-PATH=/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games
-org.openide.TopManager=org.netbeans.core.NonGui
-netbeans.dirs=/home/ralph/netbeans-5.5.1/bin/../nb5.5\:/home/ralph/netbeans-5.5.1/bin/../ide7\:/home/ralph/netbeans-5.5.1/bin/../enterprise3\:/home/ralph/netbeans-5.5.1/bin/../harness\:
-java.specification.name=Java Platform API Specification
-javadoc.author=false
-env-logname=ralph
-user.timezone=GB-Eire
-netbeans.system_http_non_proxy_hosts=
-path.separator=\:
-libs.junit.javadoc=/home/ralph/netbeans-5.5.1/ide7/docs/junit-3.8.1-api.zip
-ant.file.FreenetClient-impl=/stuff/java/netbeans_projects/FreenetClient/nbproject/build-impl.xml
-org.openide.specification.version=6.2
-env-session_manager=local/ralph-desktop\:/tmp/.ICE-unix/5479
-libs.absolutelayout.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/AbsoluteLayout.jar
-libs.jaxrpc16.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/FastInfoset.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jax-qname.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxp-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jaxrpc-spi.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/jsr173_api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/mail.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/relaxngDatatype.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/saaj-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/saaj-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxrpc16/xsdlib.jar
-netbeans.accept_license_class=org.netbeans.license.AcceptLicense
-dist.javadoc.dir=dist/javadoc
-file.encoding=UTF-8
-Env-SHELL=/bin/bash
-https.nonProxyHosts=localhost|127.0.0.1|ralph-desktop
-Env-DISPLAY=\:0.0
-libs.junit.src=
-Env-PWD=/home/ralph
-Env-GTK_RC_FILES=/etc/gtk/gtkrc\:/home/ralph/.gtkrc-1.2-gnome2
-ant.file=/stuff/java/netbeans_projects/FreenetClient/build.xml
-copyfiles.classpath=/home/ralph/netbeans-5.5.1/enterprise3/ant/extra/copyfiles.jar
-Env-AWT_TOOLKIT=MToolkit
-Env-LOGNAME=ralph
-java.io.tmpdir=/tmp
-Env-USER=ralph
-build.test.results.dir=build/test/results
-user.language=en
-libs.jaxws20.src=
-line.separator=\n
-apple.laf.useScreenMenuBar=true
-libs.absolutelayout.src=
-javac.compilerargs=
-netbeans.osenv.nullsep=true
-env-xauthority=/home/ralph/.Xauthority
-jar.compress=false
-env-gnome_desktop_session_id=Default
-java.vm.info=mixed mode, sharing
-env-ssh_agent_pid=5520
-javadoc.private=false
-sun.desktop=gnome
-java.vm.specification.name=Java Virtual Machine Specification
-build.test.classes.dir=build/test/classes
-jaxws.endorsed.dir=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api
-netbeans.dynamic.classpath=/home/ralph/netbeans-5.5.1/platform6/core/org-openide-filesystems.jar\:/home/ralph/netbeans-5.5.1/platform6/core/core.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/core_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/core/locale/org-openide-filesystems_zh_CN.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/org-netbeans-upgrader.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_pt_BR.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_zh_CN.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/org-netbeans-upgrader_ja.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_ja.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_pt_BR.jar\:/home/ralph/netbeans-5.5.1/nb5.5/core/locale/core_nb_zh_CN.jar\:/home/ralph/netbeans-5.5.1/ide7/core/org-netbeans-modules-utilities-cli.jar
-platform.active=default_platform
-env-lang=en_GB.UTF-8
-http.nonProxyHosts=localhost|127.0.0.1|ralph-desktop
-javac.includes=org/freenet/contrib/fcp/FreenetClientTest.java
-libs.jsf.src=
-Env-GNOME_DESKTOP_SESSION_ID=Default
-javadoc.encoding=
-java.awt.printerjob=sun.print.PSPrinterJob
-env-xfilesearchpath=/usr/dt/app-defaults/%L/Dt
-dist.jar=dist/FreenetClient.jar
-meta.inf.dir=src/META-INF
-libs.struts.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/antlr.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-beanutils.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-digester.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-fileupload.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-logging.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/commons-validator.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/jakarta-oro.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/struts/struts.jar
-netbeans.home=/home/ralph/netbeans-5.5.1/platform6
-ant.version=Apache Ant version 1.6.5 compiled on June 2 2005
-javadoc.nonavbar=false
-user.properties.file=/home/ralph/.netbeans/5.5.1/build.properties
-libs.toplink.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/toplink/toplink-essentials.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/toplink/toplink-essentials-agent.jar
-netbeans.importclass=org.netbeans.upgrade.AutoUpgrade
-https.proxyPort=
-build.generated.dir=build/generated
-netbeans.home+have.tests=true
-Env-LD_LIBRARY_PATH=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386
-env-home=/home/ralph
-os.name=Linux
-java.specification.vendor=Sun Microsystems Inc.
-run.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:build/test/classes
-libs.CopyLibs.src=
-java.vm.name=Java HotSpot(TM) Client VM
-Env-GDMSESSION=gnome
-org.openide.version=deprecated
-env-awt_toolkit=MToolkit
-Env-DBUS_SESSION_BUS_ADDRESS=unix\:abstract\=/tmp/dbus-mbhDWv1EWT,guid\=0f06b1e9915ba701005653004676b5ac
-libs.junit.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar
-java.library.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386\:/usr/java/packages/lib/i386\:/lib\:/usr/lib
-Env-SSH_AGENT_PID=5520
-libs.toplink.javadoc=
-ant.java.version=1.5
-env-ld_library_path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386/client\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/../lib/i386
-java.class.version=50.0
-basedir=/stuff/java/netbeans_projects/FreenetClient
-javadoc.noindex=false
-sun.awt.exception.handler=org.netbeans.core.NbErrorManager$AWTHandler
-javac.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar
-ant.home=/home/ralph/netbeans-5.5.1/ide7/ant
-javadoc.splitindex=true
-libs.toplink.src=
-javadoc.preview=true
-env-pwd=/home/ralph
-libs.CopyLibs.javadoc=
-libs.jaxws20.javadoc=
-env-shell=/bin/bash
-Env-GDM_XSERVER_LOCATION=local
-sun.boot.library.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/i386
-build.dir=build
-sun.management.compiler=HotSpot Client Compiler
-java.awt.graphicsenv=sun.awt.X11GraphicsEnvironment
-libs.jaxb20.classpath=/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/activation.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jaxb-api.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-impl.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/jaxb-xjc.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jaxws21/api/jsr173_api.jar
-javadoc.windowtitle=Freenet Client Javadocs
-http.proxyPort=
-https.proxyHost=
-libs.jstl11.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/javaee5-doc-api.zip
-netbeans.osenv=/tmp/nbenv.5853
-run.jvmargs=
-build.compiler.emacs=true
-libs.jstl11.src=
-ant.project.name=FreenetClient
-libs.swing-layout.classpath=/home/ralph/netbeans-5.5.1/platform6/modules/ext/swing-layout-1.0.jar
-java.vm.specification.version=1.0
-work.dir=/stuff/java/netbeans_projects/FreenetClient
-awt.toolkit=sun.awt.motif.MToolkit
-Env-XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt
-javadoc.use=true
-sun.cpu.isalist=
-java.ext.dirs=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/ext\:/usr/java/packages/lib/ext
-os.version=2.6.20-16-generic
-libs.jstl11.classpath=/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/standard.jar\:/home/ralph/netbeans-5.5.1/enterprise3/modules/ext/jstl.jar
-user.home=/home/ralph
-org.xml.sax.driver=com.sun.org.apache.xerces.internal.jaxp.SAXParserImpl$JAXPSAXParser
-java.vm.vendor=Sun Microsystems Inc.
-javax.xml.parsers.DocumentBuilderFactory=org.netbeans.core.startup.DOMFactoryImpl
-libs.struts.src=
-user.dir=/home/ralph
-org.openide.TopManager.GUI=true
-libs.jaxb20.javadoc=
-env-username=ralph
-libs.jsf.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/javaee5-doc-api.zip
-application.args=
-ant.file.FreenetClient=/stuff/java/netbeans_projects/FreenetClient/build.xml
-env-path=/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games
-sun.cpu.endian=little
-libs.jaxb20.src=
-Env-J2D_PIXMAPS=shared
-Env-LANG=en_GB.UTF-8
-java.vm.version=1.6.0-b105
-java.class.path=/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-nodeps.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-commons-logging.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-log4j.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jai.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-stylebook.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-xslp.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-antlr.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-resolver.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-xalan1.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-weblogic.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-commons-net.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jsch.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-oro.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-trax.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-icontract.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-netrexx.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-javamail.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-vaj.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-junit.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-swing.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-bcel.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-regexp.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-launcher.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jmf.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-starteam.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-jdepend.jar\:/home/ralph/netbeans-5.5.1/ide7/ant/lib/ant-apache-bsf.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/jsch-0.1.24.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/boot.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/org-openide-modules.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/org-openide-util.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/boot_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-modules_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_ja.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_pt_BR.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/org-openide-util_zh_CN.jar\:/home/ralph/netbeans-5.5.1/platform6/lib/locale/swing-l10n_pt_BR.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/lib/dt.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/lib/tools.jar
-javax.xml.parsers.SAXParserFactory=org.netbeans.core.startup.SAXFactoryImpl
-os.arch=i386
-http.proxyHost=
-javac.deprecation=false
-env-gdm_xserver_location=local
-nbplatform.default.netbeans.dest.dir=/home/ralph/netbeans-5.5.1
-env-nlspath=/usr/dt/lib/nls/msg/%L/%N.cat
-build.classes.excludes=**/*.java,**/*.form
-dist.dir=dist
-netbeans.user=/home/ralph/.netbeans/5.5.1
-debug.classpath=\:build/classes
-sun.java.launcher=SUN_STANDARD
-Env-XAUTHORITY=/home/ralph/.Xauthority
-env-dbus_session_bus_address=unix\:abstract\=/tmp/dbus-mbhDWv1EWT,guid\=0f06b1e9915ba701005653004676b5ac
-java.vm.specification.vendor=Sun Microsystems Inc.
-file.separator=/
-java.runtime.version=1.6.0-b105
-sun.boot.class.path=/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/resources.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/rt.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/sunrsasign.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/jsse.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/jce.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/charsets.jar\:/usr/lib/jvm/java-6-sun-1.6.0.00/jre/classes
-debug.test.classpath=\:build/classes\:/home/ralph/netbeans-5.5.1/ide7/modules/ext/junit-3.8.1.jar\:build/test/classes
-env-user=ralph
-main.class=org.freenet.contrib.fcp.FreenetClient
-have.tests=true
-test.includes=org/freenet/contrib/fcp/FreenetClientTest.java
-Env-HOME=/home/ralph
-user.country=GB
-javadoc.notree=false
-Env-NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat
-Env-DESKTOP_SESSION=gnome
-libs.struts.javadoc=/home/ralph/netbeans-5.5.1/enterprise3/docs/struts-1.2.9-javadoc.zip
-javadoc.additionalparam=
-default.javac.target=1.6
-javac.classpath=
-build.classes.dir=build/classes
-libs.swing-layout.src=
-libs.swing-layout.javadoc=/home/ralph/netbeans-5.5.1/platform6/docs/swing-layout-1.0-doc.zip
-javac.target=1.5
-java.vendor=Sun Microsystems Inc.
-env-j2d_pixmaps=shared
-env-ssh_auth_sock=/tmp/ssh-hoEFXf5479/agent.5479
-libs.jaxrpc16.javadoc=
-java.specification.version=1.6
-sun.arch.data.model=32

Modified: trunk/apps/jfcp/src/org/freenet/contrib/fcp/FcpConnection.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/FcpConnection.java      
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/FcpConnection.java      
2007-06-19 09:49:26 UTC (rev 13652)
@@ -137,7 +137,7 @@
                 logger.warning("IO error sending message: " + 
_message.getHeaderString());
                 close();
             } catch (MessageBuilderException ex) {
-                logger.warning("invalid message:\n\n" + 
_message.getMessageString() + "\n\n");
+                logger.warning("invalid message:\n\n" + 
_message.getHeaderString() + "\n\n");
             }
         }
     }

Copied: trunk/apps/jfcp/src/org/freenet/contrib/fcp/FcpMessage.java (from rev 
13650, trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/FcpMessage.java)
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/FcpMessage.java                 
        (rev 0)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/FcpMessage.java 2007-06-19 
09:49:26 UTC (rev 13652)
@@ -0,0 +1,77 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+
+package org.freenet.contrib.fcp;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.HashMap;
+import java.util.Map;
+import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;
+import org.freenet.contrib.fcp.message.*;
+
+/**
+ * The superclass of all FCP messages.
+ * @author Ralph Smithen
+ */
+public abstract class FcpMessage {
+    /**
+     * the name=value pairs of the message
+     */
+    protected Map<String, String> _fields = new HashMap();
+    /**
+     * the name of the message
+     */
+    protected String _headerString;
+    
+    /**
+     * Creates new instance, assigns {@link #_headerString _headerString}.
+     */
+    public FcpMessage(){
+        _headerString = this.getClass().getSimpleName();
+    }
+    
+    /**
+     * Accessor for message's fields.
+     * @return the message fields
+     */
+    public Map<String, String> getFields() {
+        return _fields;
+    }
+    
+    /**
+     * Get the name of the message.
+     * @return the name
+     */
+    public String getHeaderString(){
+        return _headerString;
+    }
+    
+    /**
+     * Trigger the events upon receipt or transmission of a message.
+     * @param eventSupport the object to be notified of message events
+     */
+    protected abstract void fireEvents(FcpEventSupportRepository eventSupport);
+    
+    /**
+     * Get the fields that must be non-null in a valid message.
+     * @return an array of <code>String</code>s, the names of the mandatory 
fields
+     */
+    public String[] getMandatoryFields() {
+        return new String[] {};
+    }
+    
+    /**
+     * Checks mandatory fields.
+     * @throws org.freenet.contrib.fcp.message.MessageBuilderException if 
required field absent
+     */
+    public void validate() throws MessageBuilderException{
+        
+        for(String field : getMandatoryFields()){
+            if(_fields.get(field) == null)
+                throw new MessageBuilderException("mandatory field " + field + 
" not found in message " + _headerString);
+        }
+    }
+}

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/event/FcpPeerListUpdatedEvent.java
===================================================================
--- 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/event/FcpPeerListUpdatedEvent.java  
    2007-06-18 18:19:30 UTC (rev 13651)
+++ 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/event/FcpPeerListUpdatedEvent.java  
    2007-06-19 09:49:26 UTC (rev 13652)
@@ -7,7 +7,7 @@
 import java.util.Map;
 import org.freenet.contrib.fcp.NodeInfo;
 import org.freenet.contrib.fcp.message.node.Peer;
-import org.freenet.contrib.fcp.message.node.PeerMetaData;
+import org.freenet.contrib.fcp.peer.PeerMetaData;

 /**
  *

Deleted: trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/FcpMessage.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/FcpMessage.java 
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/FcpMessage.java 
2007-06-19 09:49:26 UTC (rev 13652)
@@ -1,99 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-
-package org.freenet.contrib.fcp.message;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Map;
-import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;
-
-/**
- * The superclass of all FCP messages.
- * @author Ralph Smithen
- */
-public abstract class FcpMessage {
-    /**
-     * the name=value pairs of the message
-     */
-    protected Map<String, String> _fields = new HashMap();
-    /**
-     * the name of the message
-     */
-    protected String _headerString;
-    
-    /**
-     * Creates new instance, assigns {@link #_headerString _headerString}.
-     */
-    public FcpMessage(){
-        _headerString = this.getClass().getSimpleName();
-    }
-    
-    /**
-     * Accessor for message's fields.
-     * @return the message fields
-     */
-    public Map<String, String> getFields() {
-        return _fields;
-    }
-    
-    /**
-     * Get the name of the message.
-     * @return the name
-     */
-    public String getHeaderString(){
-        return _headerString;
-    }
-    
-    /**
-     * Trigger the events upon receipt or transmission of a message.
-     * @param eventSupport the object to be notified of message events
-     */
-    public abstract void fireEvents(FcpEventSupportRepository eventSupport);
-    
-    /**
-     * Get the fields that must be non-null in a valid message.
-     * @return an array of <code>String</code>s, the names of the mandatory 
fields
-     */
-    public String[] getMandatoryFields() {
-        return new String[] {};
-    }
-    
-    /**
-     * Checks mandatory fields.
-     * @throws org.freenet.contrib.fcp.message.MessageBuilderException if 
required field absent
-     */
-    public void validate() throws MessageBuilderException{
-        
-        for(String field : getMandatoryFields()){
-            if(_fields.get(field) == null)
-                throw new MessageBuilderException("mandatory field " + field + 
" not found in message " + _headerString);
-        }
-    }
-    
-    /**
-     * Stream the message.
-     * @param out the stream to be written to
-     */
-    public void writeMessage(PrintStream out){
-        out.println(_headerString);
-        for(Map.Entry entry : _fields.entrySet()){
-            out.println(entry.getKey() + "=" + entry.getValue());
-        }
-        out.println("EndMessage");
-    }
-    
-    
-    /**
-     * Get the text representation of the message.
-     * @return a <code>String</code> of the message's FCP representation
-     */
-    public String getMessageString(){
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        writeMessage(new PrintStream(baos));
-        return baos.toString();
-    }
-}

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientGet.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientGet.java   
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientGet.java   
2007-06-19 09:49:26 UTC (rev 13652)
@@ -24,7 +24,7 @@
         return new String[] { "URI", "Identifier" };
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getQueueEventSupport().fireKeyRequested(this);
     }


Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientHello.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientHello.java 
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientHello.java 
2007-06-19 09:49:26 UTC (rev 13652)
@@ -40,7 +40,7 @@
         _fields.put("ExpectedVersion", expectedVersion);
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
     }

 }

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientMessage.java
===================================================================
--- 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientMessage.java   
    2007-06-18 18:19:30 UTC (rev 13651)
+++ 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientMessage.java   
    2007-06-19 09:49:26 UTC (rev 13652)
@@ -4,7 +4,7 @@

 package org.freenet.contrib.fcp.message.client;

-import org.freenet.contrib.fcp.message.FcpMessage;
+import org.freenet.contrib.fcp.FcpMessage;

 /**
  *All client messages inherit from this.

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientPut.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientPut.java   
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientPut.java   
2007-06-19 09:49:26 UTC (rev 13652)
@@ -46,7 +46,7 @@
         return _mandatoryFields;
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
     }



Added: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientPutDiskDir.java
===================================================================
--- 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientPutDiskDir.java
                            (rev 0)
+++ 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ClientPutDiskDir.java
    2007-06-19 09:49:26 UTC (rev 13652)
@@ -0,0 +1,218 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+
+package org.freenet.contrib.fcp.message.client;
+
+import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;
+import org.freenet.contrib.fcp.message.DataHoldingMessage;
+import org.freenet.contrib.fcp.message.Persistence;
+import org.freenet.contrib.fcp.message.UploadFrom;
+
+/**
+ * <p>This inserts an entire on-disk directory (including subdirectories) 
under a single key (technically, 
+ * as a manifest file).  Each of the inserted files is located using the same 
key like this:</p>
+ *<pre>
+ *CHK at NOSdw7FF88S....4BgOPxSPqv~bNg7YsgM,AAEC--8/file1.txt
+ *CHK at NOSdw7FF88S....4BgOPxSPqv~bNg7YsgM,AAEC--8/file2.jpg
+ *CHK at NOSdw7FF88S....4BgOPxSPqv~bNg7YsgM,AAEC--8/subdir/file3.html
+ *CHK at NOSdw7FF88S....4BgOPxSPqv~bNg7YsgM,AAEC--8/subdir/file4.ogg
+ *CHK at NOSdw7FF88S....4BgOPxSPqv~bNg7YsgM,AAEC--8/foo/bar/file5.pdf
+ *</pre>
+ *
+ *
+ *<p>Most of the fields have the same usage as in {@link ClientPut 
ClientPut}.</p>
+ *
+ * @author Ralph Smithen
+ */
+public class ClientPutDiskDir extends ClientMessage{
+    private byte[] _data;
+    private static String[] _mandatoryFields;
+       
+    
+    /**
+     * Creates a ClientPut for direct data sending.
+     * @param uri 
+     * @param id 
+     * @param data 
+     */
+    public ClientPutDiskDir(String uri, String id, byte[] data){
+        setUri(uri);
+        setId(id);
+    }
+    
+    /**
+     * 
+     * @inheritDoc 
+     */
+    public String[] getMandatoryFields() {
+        return _mandatoryFields;
+    }
+
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
+    }
+
+    
+    public String getUri() {
+        return _fields.get("URI");
+    }
+    
+    /**
+     * The type of key to insert. When inserting an SSK key, you explicitly 
specifiy the version 
+     * number. For a USK key, use a zero and it should automatically use the 
correct version number.
+     * @param uri 
+     */
+    public void setUri(String uri) {
+        _fields.put("URI", uri);
+    }
+    
+    public String getId() {
+        return _fields.get("Identifier");
+    }
+    
+    /**
+     * This is just for client to be able to identify files that have been 
inserted.
+     * @param id 
+     */
+    public void setId(String id) {
+        _fields.put("Identifier", id);
+    }
+    
+    public String getContentType() {
+        return _fields.get("Metadata.ContentType");
+    }
+    
+    /**
+     * The MIME type of the data being inserted. For text, if charset is not 
specified, node should 
+     * auto-detect it and force the auto-detected version
+     * @param contentType 
+     */
+    public void setContentType(String contentType) {
+        _fields.put("Metadata.ContentType", contentType);
+    }
+    
+    public int getVerbosity() {
+        return Integer.parseInt(_fields.get("Verbosity"));
+    }
+    
+    /**
+     * <pre>
+     *  0: report when complete, 
+     *  1: SimpleProgress messages,
+     * 512: send StartedCompression and FinishedCompression messages
+     * </pre>
+     * @param verbosity 
+     */
+    public void setVerbosity(int verbosity) {
+        _fields.put("Verbosity", String.valueOf(verbosity));
+    }
+    
+    public int getMaxRetries() {
+        return Integer.parseInt(_fields.get("MaxRetries"));
+    }
+    
+    /**
+     * Number of times to retry if the first time doesn't work. -1 means retry 
forever.
+     * @param maxRetries 
+     */
+    public void setMaxRetries(int maxRetries) {
+        _fields.put("MaxRetries", String.valueOf(maxRetries));
+    }
+    
+    public int getPriority() {
+        return Integer.parseInt(_fields.get("PriorityClass"));
+    }
+    
+    public void setPriority(int priority) {
+        _fields.put("PriorityClass", String.valueOf(priority));
+    }
+    
+    public boolean isCHKOnly() {
+        return Boolean.parseBoolean(_fields.get("GetCHKOnly"));
+    }
+    
+    /**
+     * <p>
+     *    If set to true, it won't actually insert the data, 
+     *    just return the key it would generate.
+     * </p>
+     * 
+     * <p>
+     *    If the key is USK, you may want to transform it into a SSK, to 
prevent the node 
+     *    spending time searching for an unused index.
+     * </p>
+     * @param chk 
+     */
+    public void setCHKOnly(boolean chk) {
+        _fields.put("GetCHKOnly", String.valueOf(chk));
+    }
+    
+    public Persistence getPersistence() {
+        return Persistence.valueOf(_fields.get("Persistence"));
+    }
+    
+    public void setPersistence(Persistence persistence) {
+        _fields.put("Persistence", persistence.toString());
+    }
+    
+    public String getClientToken() {
+        return _fields.get("ClientToken");
+    }
+    
+    /**
+     * Sent back to client on the PersistentPut if this is a persistent request
+     * @param clientToken 
+     */
+    public void setClientToken(String clientToken) {
+        _fields.put("ClientToken", clientToken);
+    }
+    
+    public boolean isGlobal() {
+        return Boolean.parseBoolean(_fields.get("Global"));
+    }
+    
+    /**
+     * Whether the insert is visible on the global queue or not.
+     * @param global 
+     */
+    public void setGlobal(boolean global) {
+        _fields.put("Global", String.valueOf(global));
+    }
+    
+    public boolean isDontCompress() {
+        return Boolean.parseBoolean(_fields.get("DontCompress"));
+    }
+    
+    /**
+     * Hint to node: don't try to compress the data, it's already compressed
+     * @param dontCompress 
+     */
+    public void setDontCompress(boolean dontCompress) {
+        _fields.put("DontCompress", String.valueOf(dontCompress));
+    }
+
+    public String getFileName() {
+        return _fields.get("FileName");
+    }
+    
+    public void setFileName(String fileName) {
+        _fields.put("FileName", fileName);
+    }
+    
+    public String getDefaultName() {
+        return _fields.get("DefaultName");
+    }
+    
+    public void setDefaultName(String defaultName) {
+        _fields.put("DefaultName", defaultName);
+    }
+    
+
+    public void setAllowUnreadableFiles(boolean b) {
+        _fields.put("AllowUnreadableFiles", String.valueOf(b));
+    }
+    
+    public boolean isAllowUnreadableFiles() {
+        return Boolean.parseBoolean(_fields.get("AllowUnreadableFiles"));
+    }
+}

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/GenerateSSK.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/GenerateSSK.java 
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/GenerateSSK.java 
2007-06-19 09:49:26 UTC (rev 13652)
@@ -18,7 +18,7 @@
         setId(id);
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
     }

     public String getId() {

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ListPeerNotes.java
===================================================================
--- 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ListPeerNotes.java   
    2007-06-18 18:19:30 UTC (rev 13651)
+++ 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ListPeerNotes.java   
    2007-06-19 09:49:26 UTC (rev 13652)
@@ -26,7 +26,7 @@
         return _fields.get("NodeIdentifier");
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getPeerListEventSupport().firePeerNotesRequested(this);
     }


Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ListPeers.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ListPeers.java   
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ListPeers.java   
2007-06-19 09:49:26 UTC (rev 13652)
@@ -39,7 +39,7 @@
         _fields.put("WithVolatile", String.valueOf(withVolatile));
     }     

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getPeerListEventSupport().firePeerListRequested();
     }   
 }

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ModifyPeerNote.java
===================================================================
--- 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ModifyPeerNote.java  
    2007-06-18 18:19:30 UTC (rev 13651)
+++ 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ModifyPeerNote.java  
    2007-06-19 09:49:26 UTC (rev 13652)
@@ -7,7 +7,7 @@
 import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;

 /**
- *This message lists the peer notes for a given peer of your Freenet node.
+ *This message modifies a peer note for a given peer of your Freenet node.
  *
  * @author Ralph Smithen
  */
@@ -43,7 +43,7 @@
         return _fields.get("NoteText");
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
     }

 }

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ShutDown.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ShutDown.java    
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/client/ShutDown.java    
2007-06-19 09:49:26 UTC (rev 13652)
@@ -17,7 +17,7 @@
     public ShutDown() {
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
     }

 }

Modified: trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/AllData.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/AllData.java       
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/AllData.java       
2007-06-19 09:49:26 UTC (rev 13652)
@@ -10,10 +10,11 @@
 import org.freenet.contrib.fcp.message.DataHoldingMessage;

 /**
- *For a ClientGet with ReturnType=direct, the data is returned directly to the 
client, 
- * all at once, using the AllData message. Obviously in many situations this 
will not be desirable, 
- * hence the other ReturnType options. Persistent direct requests will not 
send this 
- * immediately on completion of the request; see GetRequestStatus.
+ * For a ClientGet with ReturnType=direct, the data is returned directly to 
the client, 
+ * all at once, using the <code>AllData</code> message. Obviously in many 
situations this 
+ * will not be desirable, hence the other {@link 
org.freenet.contrib.fcp.message.ReturnType ReturnType} options. 
+ * Persistent direct requests will not send this immediately on completion of 
the request; 
+ * see {@link GetRequestStatus GetRequestStatus}.
  *
  * @author Ralph Smithen
  */
@@ -29,10 +30,9 @@


     /**
-     * 
      * @inheritDoc 
      */
-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getQueueEventSupport().fireAllData(this);
     }


Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/DataFound.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/DataFound.java     
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/DataFound.java     
2007-06-19 09:49:26 UTC (rev 13652)
@@ -7,8 +7,8 @@
 import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;

 /**
- *
- * @author res
+ *This indicates a successful fetch of the key, but does not actually include 
the data.
+ * @author Ralph Smithen
  */
 public class DataFound extends NodeMessage{

@@ -16,7 +16,10 @@
     public DataFound() {
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    /**
+     * @inheritDoc 
+     */
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getQueueEventSupport().fireDataFound(this);
     }

@@ -43,4 +46,8 @@
     public void setDataLength(int dataLength) {
         _fields.put("ContentType", String.valueOf(dataLength));
     }
+    
+    public boolean isGlobal() {
+        return Boolean.parseBoolean(_fields.get("Global"));
+    }
 }

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/EndListPeers.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/EndListPeers.java  
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/EndListPeers.java  
2007-06-19 09:49:26 UTC (rev 13652)
@@ -7,12 +7,16 @@
 import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;

 /**
- *
- * @author res
+ *This indicates the end of a list of {@link Peer Peer} messages that have 
been sent in response to a 
+ * {@link org.freenet.contrib.fcp.message.client.ListPeers ListPeers} message.
+ * @author Ralph Smithen
  */
 public class EndListPeers extends NodeMessage{

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    /**
+     * @inheritDoc 
+     */
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getPeerListEventSupport().firePeerListUpdated();
     }


Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/GetFailed.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/GetFailed.java     
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/GetFailed.java     
2007-06-19 09:49:26 UTC (rev 13652)
@@ -8,11 +8,17 @@

 /**
  *
- * @author res
+ * <p>It indicates a freenet retrieval has failed.</p>
+ * <p>Complex <code>GetFailed</code>s are also possible; the format is 
identical to that of a 
+ * {@link PutFailed PutFailed}.</p>
+ * @author Ralph Smithen
  */
 public class GetFailed extends NodeMessage{

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    /**
+     * @inheritDoc 
+     */
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getQueueEventSupport().fireGetFailed(this);
     }


Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/IdentifierCollision.java
===================================================================
--- 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/IdentifierCollision.java
   2007-06-18 18:19:30 UTC (rev 13651)
+++ 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/IdentifierCollision.java
   2007-06-19 09:49:26 UTC (rev 13652)
@@ -7,13 +7,17 @@
 import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;

 /**
- *
- * @author res
+ * This happens when a client tries to reuse an Identifier. Identifiers are 
unique to the specific request. 
+ * They can be reused after that request has completed and removed from the 
queue.
+ * @author Ralph Smithen
  */
 public class IdentifierCollision extends NodeMessage{

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
-        
+    /**
+     * @inheritDoc 
+     */
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
+        // @todo: notify who?
     }

     public String getId() {

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/NodeHello.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/NodeHello.java     
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/NodeHello.java     
2007-06-19 09:49:26 UTC (rev 13652)
@@ -20,7 +20,7 @@
      * 
      * @inheritDoc 
      */
-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getConnectionEventSupport().fireFcpConnected(this);
     }


Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/NodeMessage.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/NodeMessage.java   
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/NodeMessage.java   
2007-06-19 09:49:26 UTC (rev 13652)
@@ -5,7 +5,7 @@
 package org.freenet.contrib.fcp.message.node;

 import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;
-import org.freenet.contrib.fcp.message.FcpMessage;
+import org.freenet.contrib.fcp.FcpMessage;

 /**
  *All node messages are a subclass of this.

Modified: trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/Peer.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/Peer.java  
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/Peer.java  
2007-06-19 09:49:26 UTC (rev 13652)
@@ -6,10 +6,12 @@

 import org.freenet.contrib.fcp.NodeInfo;
 import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;
+import org.freenet.contrib.fcp.peer.PeerMetaData;
+import org.freenet.contrib.fcp.peer.PeerVolatileData;

 /**
- *
- * @author res
+ *This gives the details of a Freenet node that is directly connected to your 
node (a peer or friend).
+ * @author Ralph Smithen
  */
 public class Peer extends NodeMessage{
     private PeerMetaData peerMetaData;
@@ -20,7 +22,10 @@
         peerVolatileData = new PeerVolatileData(this);
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    /**
+     * @inheritDoc 
+     */
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getPeerListEventSupport().firePeerUpdated(this);
     }


Deleted: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerMetaData.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerMetaData.java  
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerMetaData.java  
2007-06-19 09:49:26 UTC (rev 13652)
@@ -1,73 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-
-package org.freenet.contrib.fcp.message.node;
-
-/**
- *
- * @author res
- */
-public class PeerMetaData {
-    private Peer _p;
-    
-//            metadata.routableConnectionCheckCount=118630
-//            metadata.hadRoutableConnectionCount=20859
-//            metadata.timeLastConnected=1173191216637
-//            metadata.timeLastRoutable=1173191216637
-//            metadata.timeLastReceivedPacket=1173191156574
-//            metadata.detected.udp=130.89.162.43:50591
-    
-    public PeerMetaData(Peer p){
-        _p = p;
-    }
-
-    public int getRoutableConnectionCheckCount() {
-        return 
Integer.parseInt(_p.getFields().get("metadata.routableConnectionCheckCount"));
-    }
-
-    public void setRoutableConnectionCheckCount(int 
routableConnectionCheckCount) {
-        _p.getFields().put("metadata.routableConnectionCheckCount", 
String.valueOf(routableConnectionCheckCount));
-    }
-
-    public int getHadRoutableConnectionCount() {
-        return 
Integer.parseInt(_p.getFields().get("metadata.hadRoutableConnectionCount"));
-    }
-
-    public void setHadRoutableConnectionCount(int hadRoutableConnectionCount) {
-        _p.getFields().put("metadata.hadRoutableConnectionCount", 
String.valueOf(hadRoutableConnectionCount));
-    }
-
-    public int getTimeLastConnected() {
-        return 
Integer.parseInt(_p.getFields().get("metadata.timeLastConnected"));
-    }
-
-    public void setTimeLastConnected(int timeLastConnected) {
-        _p.getFields().put("metadata.timeLastConnected", 
String.valueOf(timeLastConnected));
-    }
-
-    public int getTimeLastRoutable() {
-        return 
Integer.parseInt(_p.getFields().get("metadata.timeLastRoutable"));
-    }
-
-    public void setTimeLastRoutable(int timeLastRoutable) {
-        _p.getFields().put("metadata.timeLastRoutable", 
String.valueOf(timeLastRoutable));
-    }
-
-    public int getTimeLastReceivedPacket() {
-        return 
Integer.parseInt(_p.getFields().get("metadata.timeLastReceivedPacket"));
-    }
-
-    public void setTimeLastReceivedPacket(int timeLastReceivedPacket) {
-        _p.getFields().put("metadata.timeLastReceivedPacket", 
String.valueOf(timeLastReceivedPacket));
-    }
-
-    public String getDetectedUdp() {
-        return _p.getFields().get("metadata.detected.udp");
-    }
-
-    public void setDetectedUdp(String detectedUdp) {
-        _p.getFields().put("metadata.detected.udp", detectedUdp);
-    }
-    
-}

Modified: trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerNote.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerNote.java      
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerNote.java      
2007-06-19 09:49:26 UTC (rev 13652)
@@ -16,7 +16,10 @@
     public PeerNote(){
     }

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    /**
+     * @inheritDoc 
+     */
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getPeerListEventSupport().firePeerNote(this);
     }


Deleted: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerVolatileData.java
===================================================================
--- 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerVolatileData.java  
    2007-06-18 18:19:30 UTC (rev 13651)
+++ 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerVolatileData.java  
    2007-06-19 09:49:26 UTC (rev 13652)
@@ -1,162 +0,0 @@
-/* This code is part of Freenet. It is distributed under the GNU General
- * Public License, version 2 (or at your option any later version). See
- * http://www.gnu.org/ for further details of the GPL. */
-
-package org.freenet.contrib.fcp.message.node;
-
-/**
- *
- * @author res
- */
-public class PeerVolatileData {
-    private Peer _p;
-    
-    public enum Status{
-        CONNECTED,
-        DISCONNECTED,
-        BACKED_OFF,
-        TOO_OLD,
-        NEVER_CONNECTED
-    }
-    
-    public enum LastRoutingBackoffReason{
-        AcceptedTimeout,
-        FatalTimeout,
-        ForwardRejectedOverload,
-        ForwardRejectedOverload2
-    }
-    
-//        volatile.averagePingTime=1.0
-//        volatile.overloadProbability=0.0
-//        volatile.idle=791670007
-//        volatile.percentTimeRoutableConnection=17.58324201298154
-//        volatile.routingBackoffPercent=0.0
-//        volatile.status=DISCONNECTED
-//        volatile.totalBytesIn=0
-//        volatile.routingBackoffLength=1000
-//        volatile.routingBackoff=0
-//        volatile.totalBytesOut=8532482
-    
-    
-//            volatile.averagePingTime=375.7280706108754
-//            volatile.overloadProbability=0.262501082516091
-//            volatile.percentTimeRoutableConnection=73.87877919472704
-//            volatile.routingBackoffPercent=0.4766362445492835
-//            volatile.status=CONNECTED
-//            volatile.totalBytesIn=185355902
-//            volatile.routingBackoffLength=1000
-//            volatile.lastRoutingBackoffReason=FatalTimeout
-//            volatile.routingBackoff=0
-//            volatile.totalBytesOut=197757028
-    
-    
-//                volatile.averagePingTime=5869.929339951476
-//                volatile.overloadProbability=21.63939255794491
-//                volatile.idle=89079368
-//                volatile.percentTimeRoutableConnection=49.16023336672756
-//                volatile.routingBackoffPercent=50.18356974749365
-//                volatile.status=DISCONNECTED
-//                volatile.totalBytesIn=30081871
-//                volatile.routingBackoffLength=256000
-//                volatile.lastRoutingBackoffReason=AcceptedTimeout
-//                volatile.routingBackoff=0
-//                volatile.totalBytesOut=72200884
-    
-    
-    
-    /** Creates a new instance of PeerVolatileData */
-    public PeerVolatileData(Peer p) {
-        _p = p;
-    }
-
-    public float getAveragePingTime() {
-        return 
Float.parseFloat(_p.getFields().get("volatile.averagePingTime"));
-    }
-
-    public void setAveragePingTime(float averagePingTime) {
-         _p.getFields().put("volatile.averagePingTime", 
String.valueOf(averagePingTime));
-    }
-
-    public float getOverloadProbability() {
-        return 
Float.parseFloat(_p.getFields().get("volatile.overloadProbability"));
-    }
-
-    public void setOverloadProbability(float overloadProbability) {
-         _p.getFields().put("volatile.overloadProbability", 
String.valueOf(overloadProbability));
-    }
-
-    public int getIdle() {
-        return Integer.parseInt(_p.getFields().get("volatile.idle"));
-    }
-
-    public void setIdle(int idle) {
-         _p.getFields().put("volatile.idle", String.valueOf(idle));
-    }
-
-    public float getPercentTimeRoutableConnection() {
-        return 
Float.parseFloat(_p.getFields().get("volatile.percentTimeRoutableConnection"));
-    }
-
-    public void setPercentTimeRoutableConnection(float 
percentTimeRoutableConnection) {
-         _p.getFields().put("volatile.percentTimeRoutableConnection", 
String.valueOf(percentTimeRoutableConnection));
-    }
-
-    public float getRoutingBackoffPercent() {
-        return 
Float.parseFloat(_p.getFields().get("volatile.routingBackoffPercent"));
-    }
-
-    public void setRoutingBackoffPercent(float routingBackoffPercent) {
-         _p.getFields().put("volatile.routingBackoffPercent", 
String.valueOf(routingBackoffPercent));
-    }
-
-    public Status getStatus() {
-        return Status.valueOf(_p.getFields().get("volatile.status").replace(' 
', '_'));
-    }
-
-    public void setStatus(Status status) {
-        _p.getFields().put("volatile.status", status.toString().replace('_', ' 
'));
-    }
-
-    public long getTotalBytesIn() {
-        return Long.parseLong(_p.getFields().get("volatile.totalBytesIn"));
-    }
-
-    public void setTotalBytesIn(long totalBytesIn) {
-        _p.getFields().put("volatile.totalBytesIn", 
String.valueOf(totalBytesIn));
-    }
-
-    public long getRoutingBackoffLength() {
-        return 
Long.parseLong(_p.getFields().get("volatile.routingBackoffLength"));
-    }
-
-    public void setRoutingBackoffLength(long routingBackoffLength) {
-        _p.getFields().put("volatile.routingBackoffLength", 
String.valueOf(routingBackoffLength));
-    }
-
-    public LastRoutingBackoffReason getLastRoutingBackoffReason() {
-        return 
LastRoutingBackoffReason.valueOf(_p.getFields().get("volatile.lastRoutingBackoffReason"));
-    }
-
-    public void setLastRoutingBackoffReason(LastRoutingBackoffReason 
lastRoutingBackoffReason) {
-        _p.getFields().put("volatile.lastRoutingBackoffReason", 
lastRoutingBackoffReason.toString());
-    }
-
-    public long getRoutingBackoff() {
-        return Long.parseLong(_p.getFields().get("volatile.routingBackoff"));
-    }
-
-    public void setRoutingBackoff(long routingBackoff) {
-        _p.getFields().put("volatile.routingBackoff", 
String.valueOf(routingBackoff));
-    }
-
-    public long getTotalBytesOut() {
-        return Long.parseLong(_p.getFields().get("volatile.totalBytesOut"));
-    }
-
-    public void setTotalBytesOut(long totalBytesOut) {
-        _p.getFields().put("volatile.totalBytesOut", 
String.valueOf(totalBytesOut));
-    }
-    
-    
-    
-}

Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PersistentPut.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PersistentPut.java 
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PersistentPut.java 
2007-06-19 09:49:26 UTC (rev 13652)
@@ -16,7 +16,10 @@
  */
 public class PersistentPut extends NodeMessage{

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    /**
+     * @inheritDoc 
+     */
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {

     }


Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/SSKKeypair.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/SSKKeypair.java    
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/SSKKeypair.java    
2007-06-19 09:49:26 UTC (rev 13652)
@@ -22,7 +22,7 @@
      * 
      * @inheritDoc 
      */
-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getSSKKeypairEventSupport().fireKeypairReceived(this);
     }


Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/SimpleProgress.java
===================================================================
--- 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/SimpleProgress.java    
    2007-06-18 18:19:30 UTC (rev 13651)
+++ 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/SimpleProgress.java    
    2007-06-19 09:49:26 UTC (rev 13652)
@@ -7,12 +7,28 @@
 import org.freenet.contrib.fcp.event.support.FcpEventSupportRepository;

 /**
- *
- * @author res
+ * <p>This indicates the progress of a large request 
+ * (usually a splitfile, a big file which is split across a large number of 
blocks).</p>
+ * 
+ * <p>
+ * Note that before FinalizedTotal=true, Total may vary wildly on a 
+ * {@link org.freenet.contrib.fcp.message.client.ClientGet ClientGet}, 
+ * because we may follow redirects, have to fetch multi-level splitfiles and 
so on. 
+ * However, once we are fetching the final splitfile, FinalizedTotal will be 
set to 
+ * true. Whereas on a {@link org.freenet.contrib.fcp.message.client.ClientPut 
ClientPut}, 
+ * we can't generate the metadata until quite late on, so it takes a long time 
to set 
+ * FinalizedTotal=true, but this doesn't matter as the Total will not increase 
very much 
+ * (since the majority of the insert is the actual data and check blocks).
+ * </p>
+ * @author Ralph Smithen
  */
 public class SimpleProgress extends NodeMessage{

-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    /**
+     * 
+     * @inheritDoc 
+     */
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getQueueEventSupport().fireSimpleProgressUpdate(this);
     }


Modified: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/URIGenerated.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/URIGenerated.java  
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/URIGenerated.java  
2007-06-19 09:49:26 UTC (rev 13652)
@@ -26,10 +26,9 @@
     }

     /**
-     * 
      * @inheritDoc 
      */
-    public void fireEvents(FcpEventSupportRepository eventSupport) {
+    protected void fireEvents(FcpEventSupportRepository eventSupport) {
         eventSupport.getSSKKeypairEventSupport().fireURIGenerated(this);
     }


Added: 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/LastRoutingBackoffReason.java
===================================================================
--- 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/LastRoutingBackoffReason.java  
                            (rev 0)
+++ 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/LastRoutingBackoffReason.java  
    2007-06-19 09:49:26 UTC (rev 13652)
@@ -0,0 +1,16 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+
+package org.freenet.contrib.fcp.peer;
+
+/**
+ *
+ * @author Ralph Smithen
+ */
+public enum LastRoutingBackoffReason {
+        AcceptedTimeout,
+        FatalTimeout,
+        ForwardRejectedOverload,
+        ForwardRejectedOverload2    
+}

Copied: trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/PeerMetaData.java 
(from rev 13649, 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerMetaData.java)
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/PeerMetaData.java          
                (rev 0)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/PeerMetaData.java  
2007-06-19 09:49:26 UTC (rev 13652)
@@ -0,0 +1,76 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+
+package org.freenet.contrib.fcp.peer;
+
+import java.util.Map;
+import org.freenet.contrib.fcp.message.node.*;
+
+/**
+ * Helper class for {@link org.freenet.contrib.fcp.message.node.Peer Peer}.
+ * @author Ralph Smithen
+ */
+public class PeerMetaData {
+    private Map<String, String> _fields;
+    
+//            metadata.routableConnectionCheckCount=118630
+//            metadata.hadRoutableConnectionCount=20859
+//            metadata.timeLastConnected=1173191216637
+//            metadata.timeLastRoutable=1173191216637
+//            metadata.timeLastReceivedPacket=1173191156574
+//            metadata.detected.udp=130.89.162.43:50591
+    
+    public PeerMetaData(Peer p){
+        _fields = p.getFields();
+    }
+
+    public int getRoutableConnectionCheckCount() {
+        return 
Integer.parseInt(_fields.get("metadata.routableConnectionCheckCount"));
+    }
+
+    public void setRoutableConnectionCheckCount(int 
routableConnectionCheckCount) {
+        _fields.put("metadata.routableConnectionCheckCount", 
String.valueOf(routableConnectionCheckCount));
+    }
+
+    public int getHadRoutableConnectionCount() {
+        return 
Integer.parseInt(_fields.get("metadata.hadRoutableConnectionCount"));
+    }
+
+    public void setHadRoutableConnectionCount(int hadRoutableConnectionCount) {
+        _fields.put("metadata.hadRoutableConnectionCount", 
String.valueOf(hadRoutableConnectionCount));
+    }
+
+    public int getTimeLastConnected() {
+        return Integer.parseInt(_fields.get("metadata.timeLastConnected"));
+    }
+
+    public void setTimeLastConnected(int timeLastConnected) {
+        _fields.put("metadata.timeLastConnected", 
String.valueOf(timeLastConnected));
+    }
+
+    public int getTimeLastRoutable() {
+        return Integer.parseInt(_fields.get("metadata.timeLastRoutable"));
+    }
+
+    public void setTimeLastRoutable(int timeLastRoutable) {
+        _fields.put("metadata.timeLastRoutable", 
String.valueOf(timeLastRoutable));
+    }
+
+    public int getTimeLastReceivedPacket() {
+        return 
Integer.parseInt(_fields.get("metadata.timeLastReceivedPacket"));
+    }
+
+    public void setTimeLastReceivedPacket(int timeLastReceivedPacket) {
+        _fields.put("metadata.timeLastReceivedPacket", 
String.valueOf(timeLastReceivedPacket));
+    }
+
+    public String getDetectedUdp() {
+        return _fields.get("metadata.detected.udp");
+    }
+
+    public void setDetectedUdp(String detectedUdp) {
+        _fields.put("metadata.detected.udp", detectedUdp);
+    }
+    
+}

Copied: trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/PeerVolatileData.java 
(from rev 13649, 
trunk/apps/jfcp/src/org/freenet/contrib/fcp/message/node/PeerVolatileData.java)
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/PeerVolatileData.java      
                        (rev 0)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/PeerVolatileData.java      
2007-06-19 09:49:26 UTC (rev 13652)
@@ -0,0 +1,148 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+
+package org.freenet.contrib.fcp.peer;
+
+import java.util.Map;
+import org.freenet.contrib.fcp.message.node.*;
+
+/**
+ * Helper class for {@link org.freenet.contrib.fcp.message.node.Peer Peer}.
+ * @author Ralph Smithen
+ */
+public class PeerVolatileData {
+    private Map<String, String> _fields;
+
+    
+//        volatile.averagePingTime=1.0
+//        volatile.overloadProbability=0.0
+//        volatile.idle=791670007
+//        volatile.percentTimeRoutableConnection=17.58324201298154
+//        volatile.routingBackoffPercent=0.0
+//        volatile.status=DISCONNECTED
+//        volatile.totalBytesIn=0
+//        volatile.routingBackoffLength=1000
+//        volatile.routingBackoff=0
+//        volatile.totalBytesOut=8532482
+    
+    
+//            volatile.averagePingTime=375.7280706108754
+//            volatile.overloadProbability=0.262501082516091
+//            volatile.percentTimeRoutableConnection=73.87877919472704
+//            volatile.routingBackoffPercent=0.4766362445492835
+//            volatile.status=CONNECTED
+//            volatile.totalBytesIn=185355902
+//            volatile.routingBackoffLength=1000
+//            volatile.lastRoutingBackoffReason=FatalTimeout
+//            volatile.routingBackoff=0
+//            volatile.totalBytesOut=197757028
+    
+    
+//                volatile.averagePingTime=5869.929339951476
+//                volatile.overloadProbability=21.63939255794491
+//                volatile.idle=89079368
+//                volatile.percentTimeRoutableConnection=49.16023336672756
+//                volatile.routingBackoffPercent=50.18356974749365
+//                volatile.status=DISCONNECTED
+//                volatile.totalBytesIn=30081871
+//                volatile.routingBackoffLength=256000
+//                volatile.lastRoutingBackoffReason=AcceptedTimeout
+//                volatile.routingBackoff=0
+//                volatile.totalBytesOut=72200884
+    
+    
+    
+    /** Creates a new instance of PeerVolatileData */
+    public PeerVolatileData(Peer p) {
+        _fields = p.getFields();
+    }
+
+    public float getAveragePingTime() {
+        return Float.parseFloat(_fields.get("volatile.averagePingTime"));
+    }
+
+    public void setAveragePingTime(float averagePingTime) {
+         _fields.put("volatile.averagePingTime", 
String.valueOf(averagePingTime));
+    }
+
+    public float getOverloadProbability() {
+        return Float.parseFloat(_fields.get("volatile.overloadProbability"));
+    }
+
+    public void setOverloadProbability(float overloadProbability) {
+         _fields.put("volatile.overloadProbability", 
String.valueOf(overloadProbability));
+    }
+
+    public int getIdle() {
+        return Integer.parseInt(_fields.get("volatile.idle"));
+    }
+
+    public void setIdle(int idle) {
+         _fields.put("volatile.idle", String.valueOf(idle));
+    }
+
+    public float getPercentTimeRoutableConnection() {
+        return 
Float.parseFloat(_fields.get("volatile.percentTimeRoutableConnection"));
+    }
+
+    public void setPercentTimeRoutableConnection(float 
percentTimeRoutableConnection) {
+         _fields.put("volatile.percentTimeRoutableConnection", 
String.valueOf(percentTimeRoutableConnection));
+    }
+
+    public float getRoutingBackoffPercent() {
+        return Float.parseFloat(_fields.get("volatile.routingBackoffPercent"));
+    }
+
+    public void setRoutingBackoffPercent(float routingBackoffPercent) {
+         _fields.put("volatile.routingBackoffPercent", 
String.valueOf(routingBackoffPercent));
+    }
+
+    public Status getStatus() {
+        return Status.valueOf(_fields.get("volatile.status").replace(' ', 
'_'));
+    }
+
+    public void setStatus(Status status) {
+        _fields.put("volatile.status", status.toString().replace('_', ' '));
+    }
+
+    public long getTotalBytesIn() {
+        return Long.parseLong(_fields.get("volatile.totalBytesIn"));
+    }
+
+    public void setTotalBytesIn(long totalBytesIn) {
+        _fields.put("volatile.totalBytesIn", String.valueOf(totalBytesIn));
+    }
+
+    public long getRoutingBackoffLength() {
+        return Long.parseLong(_fields.get("volatile.routingBackoffLength"));
+    }
+
+    public void setRoutingBackoffLength(long routingBackoffLength) {
+        _fields.put("volatile.routingBackoffLength", 
String.valueOf(routingBackoffLength));
+    }
+
+    public LastRoutingBackoffReason getLastRoutingBackoffReason() {
+        return 
LastRoutingBackoffReason.valueOf(_fields.get("volatile.lastRoutingBackoffReason"));
+    }
+
+    public void setLastRoutingBackoffReason(LastRoutingBackoffReason 
lastRoutingBackoffReason) {
+        _fields.put("volatile.lastRoutingBackoffReason", 
lastRoutingBackoffReason.toString());
+    }
+
+    public long getRoutingBackoff() {
+        return Long.parseLong(_fields.get("volatile.routingBackoff"));
+    }
+
+    public void setRoutingBackoff(long routingBackoff) {
+        _fields.put("volatile.routingBackoff", String.valueOf(routingBackoff));
+    }
+
+    public long getTotalBytesOut() {
+        return Long.parseLong(_fields.get("volatile.totalBytesOut"));
+    }
+
+    public void setTotalBytesOut(long totalBytesOut) {
+        _fields.put("volatile.totalBytesOut", String.valueOf(totalBytesOut));
+    }
+}

Added: trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/Status.java
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/Status.java                
                (rev 0)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/Status.java        
2007-06-19 09:49:26 UTC (rev 13652)
@@ -0,0 +1,18 @@
+/* This code is part of Freenet. It is distributed under the GNU General
+ * Public License, version 2 (or at your option any later version). See
+ * http://www.gnu.org/ for further details of the GPL. */
+
+package org.freenet.contrib.fcp.peer;
+
+/**
+ * Connection status of peer.
+ * @author Ralph Smithen
+ */
+public enum Status {
+        CONNECTED,
+        DISCONNECTED,
+        BACKED_OFF,
+        TOO_NEW,
+        TOO_OLD,
+        NEVER_CONNECTED
+}

Added: trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/package.html
===================================================================
--- trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/package.html               
                (rev 0)
+++ trunk/apps/jfcp/src/org/freenet/contrib/fcp/peer/package.html       
2007-06-19 09:49:26 UTC (rev 13652)
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+  <head>
+  </head>
+  <body>
+      <h1>Peer helper classes</h1>
+      <p>
+          These classes help simplify the <code>Peer</code> message.
+      </p>
+  </body>
+</html>

Modified: trunk/apps/jfcp/test/org/freenet/contrib/fcp/FreenetClientTest.java
===================================================================
--- trunk/apps/jfcp/test/org/freenet/contrib/fcp/FreenetClientTest.java 
2007-06-18 18:19:30 UTC (rev 13651)
+++ trunk/apps/jfcp/test/org/freenet/contrib/fcp/FreenetClientTest.java 
2007-06-19 09:49:26 UTC (rev 13652)
@@ -50,7 +50,7 @@

     protected void setUp() throws Exception {
         System.out.println("setUp");
-        instance = new FreenetClient(new NodeAddress(9482), 
"FreenetClientTests");
+        instance = new FreenetClient(new NodeAddress(FcpSuite.PORT), 
"FreenetClientTests");
         instance.getEventSource().addPeerListListener(this);
         instance.getEventSource().addConnectionListener(this);
         instance.getEventSource().addQueueListener(this);
@@ -158,9 +158,10 @@
     }

     public void peerListUpdated(FcpPeerListUpdatedEvent e) {
-        System.out.println("peerListUpdated, peer list:");
+        System.out.println("peerListUpdated");
         for(Map.Entry<String, Peer> entry : e.getPeers().entrySet()){
-            System.out.println("  > " + entry.getValue().getName() + "");
+            System.out.println("  " + entry.getValue().getName() + 
+                    "(" + entry.getValue().getPeerVolatileData().getStatus() + 
")");
         }
         synchronized(this){
             notify();
@@ -240,5 +241,11 @@
             notify();
         }
     }
+
+    public static Test suite() {
+        TestSuite suite = new TestSuite(FreenetClientTest.class);
+        
+        return suite;
+    }

 }

[freenet-cvs] r13652 - in trunk/apps/jfcp: . src/org/freenet/contrib/fcp src/org/freenet/contrib/fcp/event src/org/freenet/contrib/fcp/message src/org/freenet/contrib/fcp/message/client src/org/freenet/contrib/fcp/message/node src/org/freenet/contrib/fcp/peer test/org/freenet/contrib/fcp

Reply via email to