[freenet-cvs] r9592 - in trunk/freenet/src/freenet: clients/http node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-07-13 18:43:18 +0000 (Thu, 13 Jul 2006)
New Revision: 9592

Modified:
   trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/NodeStarter.java
Log:
Small refactoring to ease the deployment of new freenet-ext files

Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-07-13 
12:47:03 UTC (rev 9591)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java  2006-07-13 
18:43:18 UTC (rev 9592)
@@ -14,6 +14,7 @@
 import freenet.keys.FreenetURI;
 import freenet.node.ExtVersion;
 import freenet.node.Node;
+import freenet.node.NodeStarter;
 import freenet.node.Version;
 import freenet.node.useralerts.UserAlert;
 import freenet.support.Bucket;
@@ -416,17 +417,8 @@
                buf.append("<div class=\"infobox-content\">\n");

                buf.append("Freenet "+Version.nodeVersion+" Build 
#"+Version.buildNumber()+" r"+Version.cvsRevision+"<br/>");
-               
-                int ExtBuildNumber = -1;        
-         String ExtVer = null;          
-         try{   
-                 ExtBuildNumber = ExtVersion.buildNumber();     
-                 ExtVer = ExtVersion.cvsRevision;
-                 buf.append("Freenet-ext Build #"+ExtBuildNumber+" 
r"+ExtVer+"<br/>");          
-         }catch(Throwable t){   
-                 // Compatibility code ... will be removed      
-         }
-               
+               buf.append("Freenet-ext Build #"+NodeStarter.extBuildNumber+" 
r"+NodeStarter.extRevisionNumber+"<br/>");         
+        
                if((Version.buildNumber() < Version.highestSeenBuild) && 
advancedDarknetOutputEnabled) {
                        buf.append("<br />");
                        buf.append("<b>A newer version is available! (Build 
#"+Version.highestSeenBuild+")</b>");

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-07-13 12:47:03 UTC (rev 
9591)
+++ trunk/freenet/src/freenet/node/Node.java    2006-07-13 18:43:18 UTC (rev 
9592)
@@ -1021,8 +1021,8 @@
         */
         Node(Config config, RandomSource random, LoggingConfigHandler lc, 
NodeStarter ns) throws NodeInitException {
                // Easy stuff
-               Logger.normal(this, "Initializing Node using SVN 
r"+Version.cvsRevision);
-               System.out.println("Initializing Node using SVN 
r"+Version.cvsRevision);
+               Logger.normal(this, "Initializing Node using SVN 
r"+Version.cvsRevision+" and freenet-ext r"+NodeStarter.extRevisionNumber);
+               System.out.println("Initializing Node using SVN 
r"+Version.cvsRevision+" and freenet-ext r"+NodeStarter.extRevisionNumber);
                byte[] pwdBuf = new byte[16];
                random.nextBytes(pwdBuf);
                this.formPassword = Base64.encode(pwdBuf);

Modified: trunk/freenet/src/freenet/node/NodeStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeStarter.java     2006-07-13 12:47:03 UTC 
(rev 9591)
+++ trunk/freenet/src/freenet/node/NodeStarter.java     2006-07-13 18:43:18 UTC 
(rev 9592)
@@ -13,6 +13,7 @@
 import freenet.crypt.RandomSource;
 import freenet.crypt.Yarrow;
 import freenet.node.Node.NodeInitException;
+import freenet.support.Logger;


 /**
@@ -27,6 +28,9 @@
 {
     private Node node;
        static LoggingConfigHandler logConfigHandler;
+       public static int RECOMMENDED_EXT_BUILD_NUMBER = 1;
+       public static int extBuildNumber;
+       public static String extRevisionNumber;
        private FilePersistentConfig cfg;

     /*---------------------------------------------------------------
@@ -59,7 +63,7 @@
                System.out.println("Usage: $ java freenet.node.Node 
<configFile>");
                return new Integer(-1);
        }
-       
+        
        File configFilename;
        if(args.length == 0) {
                System.out.println("Using default config filename freenet.ini");
@@ -91,6 +95,17 @@
                return new Integer(-2);
        }

+       try{     
+               extBuildNumber = ExtVersion.buildNumber();
+               extRevisionNumber = ExtVersion.cvsRevision;
+               if(extBuildNumber == 0 || extRevisionNumber == null) throw new 
Throwable();
+       }catch(Throwable t){     
+               // Compatibility code ... will be removed
+               Logger.error(this, "Unable to get the version of your 
freenet-ext file : it's probably corrupted!");
+               extRevisionNumber = "INVALID";
+               extBuildNumber = -1;
+       }
+       
        // Setup RNG
        RandomSource random = new Yarrow();