From 7150b463ff2e6e305e8ffc7012bd615e8a05822d Mon Sep 17 00:00:00 2001
From: orbiter
Date: Sun, 16 Mar 2008 22:31:54 +0000
Subject: [PATCH] changed handling of default values and database paths: - the
default files yacy.init and for the network definition is now moved to the
path defaults - the httpProxy.conf is renamed to yacy.conf - the
DATA/INDEX/PUBLIC is renamed to the actual network nickname, which should be
freeworld or sciencenet more menu entries - added apfelmaennchens alternative
search page to the menu - added the new thread dump page to the server log
menu point as submenu modifications - modified the thread dump page: sorting
by thread type
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4575 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
addon/yacyInit.sh | 6 +-
build.xml | 11 +-
yacy.init => defaults/yacy.init | 6 +-
defaults/yacy.network.freeworld.unit | 31 +++
.../yacy.network.group | 2 +-
defaults/yacy.network.intranet.unit | 25 ++
.../yacy.network.readme | 41 +---
htroot/ConfigProperties_p.html | 2 +-
htroot/Config_p.html | 2 +-
htroot/IndexImport_p.java | 14 +-
htroot/PerformanceMemory_p.java | 2 +-
htroot/PerformanceQueues_p.java | 2 +-
htroot/Settings_p.html | 2 +-
htroot/Threaddump_p.html | 4 +-
htroot/Threaddump_p.java | 42 ++--
htroot/WatchCrawler_p.java | 11 +-
htroot/env/templates/header.template | 3 +-
htroot/env/templates/submenuViewLog.template | 1 +
locales/de.lng | 6 +-
locales/fr.lng | 6 +-
locales/it.lng | 2 +-
locales/sk.lng | 6 +-
.../plasma/dbImport/AbstractImporter.java | 3 +-
.../plasma/dbImport/SitemapImporter.java | 29 +--
.../de/anomic/plasma/dbImport/dbImporter.java | 8 +-
.../dbImport/plasmaCrawlNURLImporter.java | 17 +-
.../plasma/dbImport/plasmaDbImporter.java | 18 +-
source/de/anomic/plasma/plasmaCrawlLURL.java | 25 +-
.../de/anomic/plasma/plasmaSwitchboard.java | 21 +-
source/de/anomic/plasma/plasmaWordIndex.java | 26 +-
.../xml/opensearchdescriptionReader.java | 231 ++++++++++++++++++
source/de/anomic/yacy/yacyClient.java | 2 +-
source/de/anomic/yacy/yacyPeerActions.java | 2 +-
source/de/anomic/yacy/yacyVersion.java | 4 +-
source/yacy.java | 26 +-
startYACY.bat | 4 +-
startYACY.sh | 29 ++-
startYACY_noconsole.bat | 4 +-
stopYACY.sh | 6 +-
yacy-svn-4.spec | 17 +-
yacy.nsi | 5 +-
41 files changed, 499 insertions(+), 205 deletions(-)
rename yacy.init => defaults/yacy.init (97%)
create mode 100644 defaults/yacy.network.freeworld.unit
rename yacy.network.group => defaults/yacy.network.group (98%)
create mode 100644 defaults/yacy.network.intranet.unit
rename yacy.network.unit => defaults/yacy.network.readme (62%)
create mode 100644 source/de/anomic/xml/opensearchdescriptionReader.java
diff --git a/addon/yacyInit.sh b/addon/yacyInit.sh
index 31b2477f0..2fb33aca5 100755
--- a/addon/yacyInit.sh
+++ b/addon/yacyInit.sh
@@ -26,16 +26,16 @@ NICE_VAL=0
JAVA_ARGS="-Djava.awt.headless=true"
#get javastart args
-if [ -f DATA/SETTINGS/httpProxy.conf ]
+if [ -f DATA/SETTINGS/yacy.conf ]
then
# startup memory
for i in Xmx Xms; do
- j="`grep javastart_$i DATA/SETTINGS/httpProxy.conf | sed 's/^[^=]*=//'`";
+ j="`grep javastart_$i DATA/SETTINGS/yacy.conf | sed 's/^[^=]*=//'`";
if [ -n $j ]; then JAVA_ARGS="-$j $JAVA_ARGS"; fi;
done
# Priority
- j="`grep javastart_priority DATA/SETTINGS/httpProxy.conf | sed 's/^[^=]*=//'`";
+ j="`grep javastart_priority DATA/SETTINGS/yacy.conf | sed 's/^[^=]*=//'`";
if [ ! -z "$j" ];then
if [ -n $j ]; then NICE_VAL=$j; fi;
diff --git a/build.xml b/build.xml
index c01249837..bf8115f54 100644
--- a/build.xml
+++ b/build.xml
@@ -390,19 +390,22 @@
-
-
-
-
+
+
+
+
+
+
diff --git a/yacy.init b/defaults/yacy.init
similarity index 97%
rename from yacy.init
rename to defaults/yacy.init
index 6b6a146aa..659bfcaa4 100644
--- a/yacy.init
+++ b/defaults/yacy.init
@@ -4,7 +4,7 @@
# These properties will be loaded upon installation.
# They are used only once for set-up.
# If you make changes to this file and want these to make any effect,
-# you must delete the httpProxy.conf file in DATA/SETTINGS
+# you must delete the yacy.conf file in DATA/SETTINGS
# ----------------------------------------------------------------------------
# the HTTP service configurations
@@ -70,8 +70,8 @@ server.maxTrackingTime = 3600000
# The property here can also be a url where the definition can be loaded.
# In case of privately managed networks, this configuration must be changed BEFORE it is released
# to the members of the separated network peers.
-network.unit.definition = yacy.network.unit
-network.group.definition = yacy.network.group
+network.unit.definition = defaults/yacy.network.freeworld.unit
+network.group.definition = defaults/yacy.network.group
# Update process properties
# The update server location is given in the network.unit.definition,
diff --git a/defaults/yacy.network.freeworld.unit b/defaults/yacy.network.freeworld.unit
new file mode 100644
index 000000000..0c85027b5
--- /dev/null
+++ b/defaults/yacy.network.freeworld.unit
@@ -0,0 +1,31 @@
+# Network definition file for the freeworld network
+# this is the default standard network for fresh YaCy Peers
+
+# -----------------------------------------------------------------#
+# for an explanation please see the file yacy.network.readme #
+# this is a work in progress. disabled properties are not yet used #
+# -----------------------------------------------------------------#
+
+# general network definition
+network.unit.name = freeworld
+network.unit.description = Public YaCy Community
+network.unit.domain = global
+network.unit.search.time = 4
+network.unit.dht = true
+network.unit.dhtredundancy.junior = 1
+network.unit.dhtredundancy.senior = 3
+network.unit.bootstrap.seedlist0 = http://www.yacy.net/seed.txt
+network.unit.bootstrap.seedlist1 = http://home.arcor.de/hermens/yacy/seed.txt
+network.unit.bootstrap.seedlist2 = http://low.audioattack.de/yacy/seed.txt
+network.unit.bootstrap.seedlist3 = http://www.lulabad.de/seed.txt
+network.unit.bootstrap.seedlist4 = http://www.marcelhenseler.de/yacy/seed.txt
+
+# each network may use different yacy distributions.
+# the auto-updater can access network-specific update locations
+network.unit.update.location0 = http://yacy.net/index.html
+network.unit.update.location1 = http://latest.yacy.de
+network.unit.update.location2 = http://www.findenstattsuchen.info/YaCy/latest/index.php
+network.unit.update.location3 = http://www.yacystats.de/yacybuild/
+
+# properties for in-protocol response authentification:
+network.unit.protocol.control = uncontrolled
\ No newline at end of file
diff --git a/yacy.network.group b/defaults/yacy.network.group
similarity index 98%
rename from yacy.network.group
rename to defaults/yacy.network.group
index 2b1d57746..f5a6698fe 100644
--- a/yacy.network.group
+++ b/defaults/yacy.network.group
@@ -1,7 +1,7 @@
# YaCy Network Group Definition
# -----------------------------
# This is an addition to the yacy.network.unit configuration file.
-# This file is addressed by the network.group.definition property in yacy.init
+# This file is addressed by the network.group.definition property in defaults/yacy.init
# The purpose of a group within a network is that some parts of a network may be managed independently,
# while the content of the network stays private for the whole network, mostly for a special purpose.
# This file needs to be configured if someone wants to participate with several peers to the network,
diff --git a/defaults/yacy.network.intranet.unit b/defaults/yacy.network.intranet.unit
new file mode 100644
index 000000000..5ef5d5220
--- /dev/null
+++ b/defaults/yacy.network.intranet.unit
@@ -0,0 +1,25 @@
+# Network definition file for the freeworld network
+# this is the default standard network for fresh YaCy Peers
+
+# -----------------------------------------------------------------#
+# for an explanation please see the file yacy.network.readme #
+# this is a work in progress. disabled properties are not yet used #
+# -----------------------------------------------------------------#
+
+# general network definition
+network.unit.name = intranet
+network.unit.description = Private Intranet
+network.unit.domain = local
+network.unit.dht = false
+network.unit.dhtredundancy.junior = 1
+network.unit.dhtredundancy.senior = 1
+
+# each network may use different yacy distributions.
+# the auto-updater can access network-specific update locations
+network.unit.update.location0 = http://yacy.net/index.html
+network.unit.update.location1 = http://latest.yacy.de
+network.unit.update.location2 = http://www.findenstattsuchen.info/YaCy/latest/index.php
+network.unit.update.location3 = http://www.yacystats.de/yacybuild/
+
+# properties for in-protocol response authentification:
+network.unit.protocol.control = uncontrolled
\ No newline at end of file
diff --git a/yacy.network.unit b/defaults/yacy.network.readme
similarity index 62%
rename from yacy.network.unit
rename to defaults/yacy.network.readme
index b785355c7..eda000c3d 100644
--- a/yacy.network.unit
+++ b/defaults/yacy.network.readme
@@ -6,7 +6,7 @@
# To distinguish between index areas where the shared web index is for a intranet or the public internet,
# we distinguish local and global networks. Each network type can have different user groups.
# Groups can be uncontrolled, moderated or controlled. The whole network may also have a global master.
-# This file is adressed by the network.unit.definition property in yacy.init. If necessary this
+# This file is adressed by the network.unit.definition property in defaults/yacy.init. If necessary this
# property can also address a URL where a network definition file can be hosted, so that a network
# can easily be moderated from a single central. In case of the public network of all independent peers
# for global indexing, the network definition is attached to the release and defines no network master or
@@ -42,42 +42,3 @@
# network.unit.administration.manager =
# network.unit.administration.request.authentification.method = 'salted-magic'
# network.unit.administration.request.authentification.essentials =
-
-
-# -----------------------------------------------------------------#
-# this is a work in progress. disabled properties are not yet used #
-# -----------------------------------------------------------------#
-
-# general network definition
-network.unit.name = freeworld
-network.unit.description = Public YaCy Community
-network.unit.domain = global
-network.unit.search.time = 4
-network.unit.dht = true
-network.unit.dhtredundancy.junior = 1
-network.unit.dhtredundancy.senior = 3
-network.unit.bootstrap.seedlist0 = http://www.yacy.net/seed.txt
-network.unit.bootstrap.seedlist1 = http://home.arcor.de/hermens/yacy/seed.txt
-network.unit.bootstrap.seedlist2 = http://low.audioattack.de/yacy/seed.txt
-network.unit.bootstrap.seedlist3 = http://www.lulabad.de/seed.txt
-network.unit.bootstrap.seedlist4 = http://www.marcelhenseler.de/yacy/seed.txt
-
-# each network may use different yacy distributions.
-# the auto-updater can access network-specific update locations
-network.unit.update.location0 = http://yacy.net/index.html
-network.unit.update.location1 = http://latest.yacy.de
-network.unit.update.location2 = http://www.findenstattsuchen.info/YaCy/latest/index.php
-network.unit.update.location3 = http://www.yacystats.de/yacybuild/
-
-# properties for in-protocol response authentification:
-network.unit.protocol.control = uncontrolled
-#network.unit.protocol.request.authentification.method = salted-magic-sim
-#network.unit.protocol.request.authentification.essentials =
-#network.unit.protocol.response.authentification.method = challenge-pwresponse
-#network.unit.protocol.response.authentification.essentials =
-
-# properties for unit access administrator-authentification:
-#network.unit.administration.control = uncontrolled
-#network.unit.administration.manager =
-#network.unit.administration.request.authentification.method = salted-magic
-#network.unit.administration.request.authentification.essentials =
diff --git a/htroot/ConfigProperties_p.html b/htroot/ConfigProperties_p.html
index 8764eafbe..94cee5c81 100644
--- a/htroot/ConfigProperties_p.html
+++ b/htroot/ConfigProperties_p.html
@@ -44,7 +44,7 @@
You can change anything, but some options need a restart, and some options can crash YaCy, if wrong values are used.
- For explanation please look into yacy.init
+ For explanation please look into defaults/yacy.init