fixed last commit + added missing files

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@106 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 20 years ago
parent b4030e5023
commit 0cfe94bb66

@ -70,7 +70,7 @@
<property name="javacTarget" value="1.4"/>
<!-- Release Configuration -->
<property name="releaseVersion" value="0.372"/>
<property name="releaseVersion" value="0.373"/>
<property name="releaseFile" value="yacy_v${releaseVersion}_${DSTAMP}.tgz"/>
<target name="init">

@ -86,24 +86,25 @@ public abstract class serverAbstractSwitch implements serverSwitch {
// load config's from last save
if (configFile.exists()) configProps = loadHashMap(configFile); else configProps = new HashMap();
synchronized (configProps) {
// remove all values from config that do not appear in init (out-dated settings)
Iterator i = configProps.keySet().iterator();
String key;
while (i.hasNext()) {
key = (String) i.next();
if (!(initProps.containsKey(key))) i.remove();
}
// remove all values from config that do not appear in init (out-dated settings)
Iterator i = configProps.keySet().iterator();
String key;
while (i.hasNext()) {
key = (String) i.next();
if (!(initProps.containsKey(key))) {
configProps.remove(key);
}
}
// merge new props from init to config
// this is necessary for migration, when new properties are attached
initProps.putAll(configProps);
configProps = initProps;
// save result; this may initially create a config file after initialization
saveConfig();
// merge new props from init to config
// this is necessary for migration, when new properties are attached
initProps.putAll(configProps);
configProps = initProps;
// save result; this may initially create a config file after initialization
saveConfig();
}
// other settings
authorization = new HashMap();
@ -232,13 +233,16 @@ public abstract class serverAbstractSwitch implements serverSwitch {
newAction.setLog(log);
newAction.setDescription(actionShortDescription, actionLongDescription);
switchActions.put(actionName, newAction);
log.logInfo("Deployed Action '" + actionShortDescription + "', (" + switchActions.size() + " actions registered)");
}
public void undeployAction(String actionName) {
serverSwitchAction action = (serverSwitchAction) switchActions.get(actionName);
action.close();
switchActions.remove(actionName);
log.logInfo("Undeployed Action '" + action.getShortDescription() + "', (" + switchActions.size() + " actions registered)");
}
public void deployThread(String threadName, String threadShortDescription, String threadLongDescription, serverThread newThread, long startupDelay) {
deployThread(threadName, threadShortDescription, threadLongDescription,
newThread, startupDelay,

@ -0,0 +1,69 @@
// serverSwitchAbstractAction.java
// -------------------------------------
// (C) by Michael Peter Christen; mc@anomic.de
// first published on http://www.anomic.de
// Frankfurt, Germany, 2005
// last major change: 11.05.2005
//
// 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.
package de.anomic.server;
public abstract class serverSwitchAbstractAction {
private serverLog log = null;
private String shortDescr = "", longDescr = "";
public void setDescription(String shortText, String longText) {
// sets a visible description string
this.shortDescr = shortText;
this.longDescr = longText;
}
public String getShortDescription() {
// returns short description string for online display
return this.shortDescr;
}
public String getLongDescription() {
// returns long description string for online display
return this.longDescr;
}
public void setLog(serverLog log) {
// defines a log where process states can be written to
this.log = log;
}
}

@ -0,0 +1,70 @@
// serverSwitchAction.java
// -------------------------------------
// (C) by Michael Peter Christen; mc@anomic.de
// first published on http://www.anomic.de
// Frankfurt, Germany, 2005
// last major change: 11.05.2005
//
// 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.
package de.anomic.server;
public interface serverSwitchAction {
// --------------------------------------------------------------------------
// the following methods are implemented by serverSwitchAsbtractAction
// and do not need to be altered
public void setDescription(String shortText, String longText);
// sets a visible description string
public String getShortDescription();
// returns short description string for online display
public String getLongDescription();
// returns long description string for online display
public void setLog(serverLog log);
// defines a log where process states can be written to
// ---------------------------------------------------------------------
// the following methods are supposed to be implemented
// by extending a serverSwitchAbstractAction object
public void doBevoreSetConfig(String key, String newvalue);
public void doAfterSetConfig(String key, String newvalue, String oldvalue);
public void doWhenGetConfig(String key, String actualvalue, String defaultvalue);
public void close(); // called when an action is undeployed
}

@ -1,2 +1,2 @@
#plasmaParser configuration file
#Wed May 11 13:47:09 CEST 2005
#Wed May 11 17:48:25 CEST 2005

Loading…
Cancel
Save