From 889de6686c7083726babace616f7b90f81d4b4d3 Mon Sep 17 00:00:00 2001
From: allo <allo@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sun, 13 Nov 2005 15:12:48 +0000
Subject: [PATCH] Migration in yacyVersion

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1070 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 source/de/anomic/yacy/yacyVersion.java | 42 +++++++++++++++++++++++
 source/yacy.java                       | 46 +++-----------------------
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/source/de/anomic/yacy/yacyVersion.java b/source/de/anomic/yacy/yacyVersion.java
index b4f671743..7436668f6 100644
--- a/source/de/anomic/yacy/yacyVersion.java
+++ b/source/de/anomic/yacy/yacyVersion.java
@@ -1,7 +1,49 @@
 package de.anomic.yacy;
 
+import de.anomic.plasma.plasmaSwitchboard;
+import de.anomic.server.serverCodings;
+
 public final class yacyVersion {    
     public static final float YACY_SUPPORTS_PORT_FORWARDING = (float) 0.383;
     public static final float YACY_SUPPORTS_GZIP_POST_REQUESTS = (float) 0.40300772;
     public static final float YACY_ACCEPTS_RANKING_TRANSMISSION = (float) 0.414;
+    
+    public static void migrate(plasmaSwitchboard sb){
+    		//set preset accounts/passwords
+        String acc;
+        if ((acc = sb.getConfig("proxyAccount", "")).length() > 0) {
+            sb.setConfig("proxyAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(acc)));
+            sb.setConfig("proxyAccount", "");
+        }
+        if ((acc = sb.getConfig("serverAccount", "")).length() > 0) {
+            sb.setConfig("serverAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(acc)));
+            sb.setConfig("serverAccount", "");
+        }
+        if ((acc = sb.getConfig("adminAccount", "")).length() > 0) {
+            sb.setConfig("adminAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(acc)));
+            sb.setConfig("adminAccount", "");
+        }
+
+        // fix unsafe old passwords
+        if ((acc = sb.getConfig("proxyAccountBase64", "")).length() > 0) {
+            sb.setConfig("proxyAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
+            sb.setConfig("proxyAccountBase64", "");
+        }
+        if ((acc = sb.getConfig("serverAccountBase64", "")).length() > 0) {
+            sb.setConfig("serverAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
+            sb.setConfig("serverAccountBase64", "");
+        }
+        if ((acc = sb.getConfig("adminAccountBase64", "")).length() > 0) {
+            sb.setConfig("adminAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
+            sb.setConfig("adminAccountBase64", "");
+        }
+        if ((acc = sb.getConfig("uploadAccountBase64", "")).length() > 0) {
+            sb.setConfig("uploadAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
+            sb.setConfig("uploadAccountBase64", "");
+        }
+        if ((acc = sb.getConfig("downloadAccountBase64", "")).length() > 0) {
+            sb.setConfig("downloadAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
+            sb.setConfig("downloadAccountBase64", "");
+        }
+    }
 }
diff --git a/source/yacy.java b/source/yacy.java
index ab8388517..5a6deab98 100644
--- a/source/yacy.java
+++ b/source/yacy.java
@@ -70,20 +70,20 @@ import de.anomic.plasma.plasmaCrawlLURL;
 import de.anomic.plasma.plasmaSwitchboard;
 import de.anomic.plasma.plasmaURL;
 import de.anomic.plasma.plasmaWordIndex;
+import de.anomic.plasma.plasmaWordIndexCache;
+import de.anomic.plasma.plasmaWordIndexClassicDB;
 import de.anomic.plasma.plasmaWordIndexEntity;
 import de.anomic.plasma.plasmaWordIndexEntry;
-import de.anomic.plasma.plasmaWordIndexClassicDB;
-import de.anomic.plasma.plasmaWordIndexCache;
 import de.anomic.plasma.plasmaWordIndexEntryContainer;
 import de.anomic.server.serverCore;
 import de.anomic.server.serverDate;
-import de.anomic.server.serverCodings;
 import de.anomic.server.serverFileUtils;
 import de.anomic.server.serverSystem;
 import de.anomic.server.logging.serverLog;
 import de.anomic.tools.enumerateFiles;
-import de.anomic.yacy.yacyCore;
 import de.anomic.yacy.yacyClient;
+import de.anomic.yacy.yacyCore;
+import de.anomic.yacy.yacyVersion;
 
 /**
 * This is the main class of the proxy. Several threads are started from here:
@@ -323,43 +323,7 @@ public final class yacy {
             //} catch (IOException e) {}
 
 
-            // set preset accounts/passwords
-            String acc;
-            if ((acc = sb.getConfig("proxyAccount", "")).length() > 0) {
-                sb.setConfig("proxyAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(acc)));
-                sb.setConfig("proxyAccount", "");
-            }
-            if ((acc = sb.getConfig("serverAccount", "")).length() > 0) {
-                sb.setConfig("serverAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(acc)));
-                sb.setConfig("serverAccount", "");
-            }
-            if ((acc = sb.getConfig("adminAccount", "")).length() > 0) {
-                sb.setConfig("adminAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(serverCodings.standardCoder.encodeBase64String(acc)));
-                sb.setConfig("adminAccount", "");
-            }
-
-            // fix unsafe old passwords
-            if ((acc = sb.getConfig("proxyAccountBase64", "")).length() > 0) {
-                sb.setConfig("proxyAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
-                sb.setConfig("proxyAccountBase64", "");
-            }
-            if ((acc = sb.getConfig("serverAccountBase64", "")).length() > 0) {
-                sb.setConfig("serverAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
-                sb.setConfig("serverAccountBase64", "");
-            }
-            if ((acc = sb.getConfig("adminAccountBase64", "")).length() > 0) {
-                sb.setConfig("adminAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
-                sb.setConfig("adminAccountBase64", "");
-            }
-            if ((acc = sb.getConfig("uploadAccountBase64", "")).length() > 0) {
-                sb.setConfig("uploadAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
-                sb.setConfig("uploadAccountBase64", "");
-            }
-            if ((acc = sb.getConfig("downloadAccountBase64", "")).length() > 0) {
-                sb.setConfig("downloadAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(acc));
-                sb.setConfig("downloadAccountBase64", "");
-            }
-
+            yacyVersion.migrate(sb);
             // start main threads
             try {
                 final httpd protocolHandler = new httpd(sb, new httpdFileHandler(sb), new httpdProxyHandler(sb));