From b453199c6878804402b024c092ffb0c64259b940 Mon Sep 17 00:00:00 2001 From: allo Date: Tue, 17 Jan 2006 21:33:19 +0000 Subject: [PATCH] first step for a special migration class. git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1365 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- source/migration.java | 99 +++++++++++++++++++++++++++++++++++++++++++ source/yacy.java | 51 +--------------------- 2 files changed, 100 insertions(+), 50 deletions(-) create mode 100644 source/migration.java diff --git a/source/migration.java b/source/migration.java new file mode 100644 index 000000000..210a6feb4 --- /dev/null +++ b/source/migration.java @@ -0,0 +1,99 @@ +// migration.java +// ----------------------- +// (C) by Michael Peter Christen; mc@anomic.de +// first published on http://www.yacy.net +// Frankfurt, Germany, 2004, 2005 +// +// this file is contributed by Alexander Schier +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// Using this software in any meaning (reading, learning, copying, compiling, +// running) means that you agree that the Author(s) is (are) not responsible +// for cost, loss of data or any harm that may be caused directly or indirectly +// by usage of this softare or this documentation. The usage of this software +// is on your own risk. The installation and usage (starting/running) of this +// software may allow other people or application to access your computer and +// any attached devices and is highly dependent on the configuration of the +// software which must be done by the user of the software; the author(s) is +// (are) also not responsible for proper configuration and usage of the +// software, even if provoked by documentation provided together with +// the software. +// +// Any changes to this file according to the GPL as documented in the file +// gpl.txt aside this file in the shipment you received can be done to the +// lines that follows this copyright notice here, but changes must not be +// done inside the copyright notive above. A re-distribution must contain +// the intact and unchanged copyright notice. +// Contributions and changes to the program code must be marked as such. + +import de.anomic.kelondro.kelondroBase64Order; +import de.anomic.plasma.plasmaSwitchboard; + +public class migration { + public static void main(String[] args) { + + } + public static void migrate(plasmaSwitchboard sb){ + presetPasswords(sb); + migrateSwitchConfigSettings(sb); + } + + public static void presetPasswords(plasmaSwitchboard sb) { + // set preset accounts/passwords + String acc; + if ((acc = sb.getConfig("serverAccount", "")).length() > 0) { + sb.setConfig("serverAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(kelondroBase64Order.standardCoder.encodeString(acc))); + sb.setConfig("serverAccount", ""); + } + if ((acc = sb.getConfig("adminAccount", "")).length() > 0) { + sb.setConfig("adminAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(kelondroBase64Order.standardCoder.encodeString(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", ""); + } + } + + public static void migrateSwitchConfigSettings(plasmaSwitchboard sb) { + String value = ""; + if ((value = sb.getConfig("parseableMimeTypes","")).length() > 0) { + sb.setConfig("parseableMimeTypes.CRAWLER", value); + sb.setConfig("parseableMimeTypes.PROXY", value); + sb.setConfig("parseableMimeTypes.URLREDIRECTOR", value); + sb.setConfig("parseableMimeTypes.ICAP", value); + } + } + +} diff --git a/source/yacy.java b/source/yacy.java index e3081107b..87a4e9287 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -70,7 +70,6 @@ import de.anomic.http.httpd; import de.anomic.http.httpdFileHandler; import de.anomic.http.httpdProxyHandler; import de.anomic.http.httpc.response; -import de.anomic.kelondro.kelondroBase64Order; import de.anomic.kelondro.kelondroMScoreCluster; import de.anomic.plasma.plasmaCrawlLURL; import de.anomic.plasma.plasmaSwitchboard; @@ -171,53 +170,6 @@ public final class yacy { return (float) (((double) v * 100000000.0 + ((double) svn)) / 100000000.0); } - public static void presetPasswords(plasmaSwitchboard sb) { - // set preset accounts/passwords - String acc; - if ((acc = sb.getConfig("serverAccount", "")).length() > 0) { - sb.setConfig("serverAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(kelondroBase64Order.standardCoder.encodeString(acc))); - sb.setConfig("serverAccount", ""); - } - if ((acc = sb.getConfig("adminAccount", "")).length() > 0) { - sb.setConfig("adminAccountBase64MD5", de.anomic.server.serverCodings.encodeMD5Hex(kelondroBase64Order.standardCoder.encodeString(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", ""); - } - } - - - public static void migrateSwitchConfigSettings(plasmaSwitchboard sb) { - String value = ""; - if ((value = sb.getConfig("parseableMimeTypes","")).length() > 0) { - sb.setConfig("parseableMimeTypes.CRAWLER", value); - sb.setConfig("parseableMimeTypes.PROXY", value); - sb.setConfig("parseableMimeTypes.URLREDIRECTOR", value); - sb.setConfig("parseableMimeTypes.ICAP", value); - } - } - - /** * Starts up the whole application. Sets up all datastructures and starts * the main threads. @@ -377,8 +329,7 @@ public final class yacy { serverFileUtils.copy(new File(htRootPath, "htdocsdefault/dir.html"), new File(shareDefaultPath, "dir.html")); //} catch (IOException e) {} - presetPasswords(sb); - migrateSwitchConfigSettings(sb); + migration.migrate(sb); // start main threads try {