one more fix for SVN 7713

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7716 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/Settings_p.java

@@ -29,7 +29,6 @@ import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
 
 import de.anomic.search.Switchboard;
-import de.anomic.search.SwitchboardConstants;
 import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 import de.anomic.yacy.yacyCore;
@@ -91,23 +90,8 @@ public final class Settings_p {
         prop.put("proxy.sendViaHeader", env.getConfigBool("proxy.sendViaHeader", false) ? "1" : "0");
         prop.put("proxy.sendXForwardedForHeader", env.getConfigBool("proxy.sendXForwardedForHeader", true) ? "1" : "0");
 
-        // set values
-        String s;
-        int pos;
-        
         // admin password
-        if (env.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64, "").length() == 0) {
-            // no password has been specified
-            prop.put("adminuser","admin");
-        } else {
-            s = env.getConfig("adminAccount", "admin:void");
-            pos = s.indexOf(":");
-            if (pos < 0) {
-                prop.put("adminuser","admin");
-            } else {
-                prop.put("adminuser",s.substring(0, pos));
-            }
-        }
+        prop.put("adminuser","admin");
         
         // remote proxy
         prop.put("remoteProxyUseChecked", env.getConfigBool("remoteProxyUse", false) ? 1 : 0);

source/de/anomic/search/SwitchboardConstants.java

@@ -42,7 +42,6 @@ public final class SwitchboardConstants {
      * by first encoding <code>username:password</code> as Base64 and hashing it using {@link MapTools#encodeMD5Hex(String)}.</p>
      */
     public static final String ADMIN_ACCOUNT_B64MD5 = "adminAccountBase64MD5";
-    public static final String ADMIN_ACCOUNT_B64    = "adminAccountBase64";
     
     public static final int   CRAWLJOB_SYNC = 0;
     public static final int   CRAWLJOB_STATUS = 1;

source/net/yacy/migration.java

@@ -215,10 +215,6 @@ public class migration {
             sb.setConfig("proxyAccountBase64MD5", Digest.encodeMD5Hex(acc));
             sb.setConfig("proxyAccountBase64", "");
         }
-        if ((acc = sb.getConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64, "")).length() > 0) {
-            sb.setConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64MD5, Digest.encodeMD5Hex(acc));
-            sb.setConfig(SwitchboardConstants.ADMIN_ACCOUNT_B64, "");
-        }
         if ((acc = sb.getConfig("uploadAccountBase64", "")).length() > 0) {
             sb.setConfig("uploadAccountBase64MD5", Digest.encodeMD5Hex(acc));
             sb.setConfig("uploadAccountBase64", "");