[Netarchivesuite-devel] simple_harvest removed from NetarchiveSuite trunk
Søren Vejrup Carlsen
svc at kb.dk
Fri Nov 20 16:10:36 CET 2009
Hi everybody
I have now replaced the deprecated simple_harvest scripts from the NetarchiveSuite SVN trunk
Instead of these scripts, one should use the RunNetarchiveSuite.sh (http://netarchive.dk/suite/Installation_Manual_3.10/AppendixC?action=AttachFile&do=get&target=RunNetarchiveSuite.sh) used to deploy a NetarchiveSuite on a single machine.
>From 3.10.0 the NetarchiveSuite Quickstart manual uses this script instead of the old simple_harvest.
Cf. http://netarchive.dk/suite/Quick_Start_Manual_3.10
The RunNetarchiveSuite.sh will soon appear in the trunk in the new "samples" directory
Best regards
---------------------------------------------------------------------------
Søren Vejrup Carlsen, NetarchiveSuite developer (and QA)
Department of Digital Preservation, Royal Library, Copenhagen, Denmark
tlf: (+45) 33 47 48 41
email: svc at kb.dk
----------------------------------------------------------------------------
Non omnia possumus omnes
--- Macrobius, Saturnalia, VI, 1, 35 -------
-----Oprindelig meddelelse-----
Fra: netarchivesuite-commits-bounces at lists.gforge.statsbiblioteket.dk [mailto:netarchivesuite-commits-bounces at lists.gforge.statsbiblioteket.dk] På vegne af svc at callisto.statsbiblioteket.dk
Sendt: 20. november 2009 15:43
Til: netarchivesuite-commits at lists.gforge.statsbiblioteket.dk
Emne: [Netarchivesuite-commits] r1133 - trunk/scripts/simple_harvest
Author: svc
Date: 2009-11-20 15:43:27 +0100 (Fri, 20 Nov 2009)
New Revision: 1133
Removed:
trunk/scripts/simple_harvest/data/
trunk/scripts/simple_harvest/harvest.sh
trunk/scripts/simple_harvest/killhard.sh
trunk/scripts/simple_harvest/killharvest.sh
trunk/scripts/simple_harvest/log.prop
trunk/scripts/simple_harvest/log/
trunk/scripts/simple_harvest/quickstart.jmxremote.access
trunk/scripts/simple_harvest/quickstart.jmxremote.password
trunk/scripts/simple_harvest/quickstart.security.policy
trunk/scripts/simple_harvest/settings.xml
Log:
Remove simple_harvest system from our trunk;
The simple_harvest system has been replaced by the script RunNetarchiveSuite.sh:
http://netarchive.dk/suite/Installation_Manual_3.10/AppendixC?action=AttachFile&do=get&target=RunNetarchiveSuite.sh
The RunNetarchiveSuite.sh will soon appear in the trunk in the new "samples" directory
Deleted: trunk/scripts/simple_harvest/harvest.sh
===================================================================
--- trunk/scripts/simple_harvest/harvest.sh 2009-11-20 14:13:33 UTC (rev 1132)
+++ trunk/scripts/simple_harvest/harvest.sh 2009-11-20 14:43:27 UTC (rev 1133)
@@ -1,258 +0,0 @@
-#!/bin/bash
-
-## $Id$
-## $Revision$
-## $Date$
-## $Author$
-##
-## The Netarchive Suite - Software to harvest and preserve websites
-## Copyright 2004-2009 Det Kongelige Bibliotek and Statsbiblioteket, Denmark
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-
-## This script can be used to start up a clean "local" functioning
-## NetarchiveSuite with all applications running on the local machine. The only
-## configuration which should be necessary is setting the paths to the JMS
-## broker, JRE, and NetarchiveSuite project below.
-
-## Path for Java 1.6.0_07 or higher, can be overridden by $JAVA or $JAVA_HOME
-JAVA=${JAVA:=${JAVA_HOME:=/usr/java}}
-
-## Path for the JMS broker, can be overriden by $IMQ
-IMQ=${IMQ:=/opt/sun/mq/bin/imqbrokerd}
-
-## Path for the Java executable, can be overridden by $JAVA_CMD
-JAVA_CMD=${JAVA_CMD:=$JAVA_HOME/bin/java}
-
-## ------------ The following settings normally work --------------
-
-## The home directory for this local NetarchiveSuite relative to base dir
-ARCREP_HOME=${ARCREP_HOME:=$( cd $( dirname $0 ) && pwd )}
-
-## Path for the NetarchiveSuite base dir, can be overridden by $NETARCHIVEDIR,
-## but that's usually not necessary.
-NETARCHIVEDIR=${NETARCHIVEDIR:=$( cd $ARCREP_HOME/../.. && pwd )}
-
-## How far to offset the xterms horizontally. If you make the xterms smaller,
-## change this parameter correspondingly
-XTERM_HOFFSET=${XTERM_HOFFSET:=550}
-## How far to offset the xterms vertically. If you make the xterms smaller,
-## change this parameter correspondingly
-XTERM_VOFFSET=${XTERM_VOFFSET:=350}
-
-## The command used to start the xterms. By defauly, extra save lines are
-## set. If you want the windows to be smaller, you may be able to use -fs
-## to change font size, if your xterm is compiled with freetype. Otherwise,
-## you might be able to use another implementation, as long as the -geometry,
-## -title, -e, and -hold arguments are supported.
-XTERM_CMD=${XTERM_CMD:='xterm -sl 1000'}
-
-## ---------- No changes should be required below this line ---------------
-
-## The below ports are only used internally on the same machine, but you
-## should make sure nothing else is using them.
-
-## Initial JMXPORT, must be ++'d after each application started, incl. SideKick
-## Ports 8100-8110 are used
-export JMXPORT=8100
-
-## Initial HTTPPORT, must be ++'d after each application started
-## Ports 8070-8078 are used
-export HTTPPORT=8070
-
-## Initial FILETRANSFERPORT, must be ++'d after each application started
-## Ports 8040-8048 are used
-export FILETRANSFERPORT=8040
-
-## Initial Heritrix GUI port (with JMX port one higher), must be += 2'ed after
-## each application started.
-## Ports 8090-8093 are used.
-export HERITRIXPORT=8090
-
-## Set $KEEPDATA to non-empty to avoid cleaning data at the start of each run.
-## This will make the startup process more complex, but will allow you to reuse
-## what you did last time.
-
-## Whether or not to use -hold argument
-## Set $HOLD to the empty string to have windows automatically close when
-## the process dies.
-if [ -z "${!HOLD*}" ]; then
- HOLD=-hold
-fi
-
-## ----------- No interesting information below this line --------------
-
-# Utility functions
-function makeCommonOptions {
- echo "-Dsettings.common.jmx.port=$JMXPORT \
- -Dsettings.common.jmx.rmiPort=$(( $JMXPORT + 100 )) \
- -Dsettings.common.jmx.passwordFile=$ARCREP_HOME/quickstart.jmxremote.password \
- -Dsettings.common.jmx.accessFile=$ARCREP_HOME/quickstart.jmxremote.access \
- -Dcom.sun.management.jmxremote \
- -Ddk.netarkivet.quickstart.basedir=$NETARCHIVEDIR \
- -Djava.security.manager \
- -Djava.security.policy=$ARCREP_HOME/quickstart.security.policy";
-}
-
-function makeXtermOffset {
- echo +$(( $XTERM_HOFFSET * ($WINDOWPOS / 3) ))+$(( $XTERM_VOFFSET * ($WINDOWPOS % 3) ));
-}
-
-# Start a "normal" application (non-harvest).
-# Arg 1 is the XTerm's title
-# Arg 2 is the class name
-# Arg 3 is any other args that need to be passed to Java.
-function startApp {
- local title app termgeom otherargs;
- title=$1;
- app=$2;
- otherargs=$3;
- termgeom=$TERMSIZE`makeXtermOffset`;
- logpropfile="$ARCREP_HOME/log/log.prop.$title-$HTTPPORT"
- sed 's!\(java.util.logging.FileHandler.pattern=\).*!\1'$ARCREP_HOME'/log/'$title'-'$HTTPPORT'.log!;' <$ARCREP_HOME/log.prop > "$logpropfile"
- $XTERM_CMD $HOLD -geometry $termgeom -title "$title" -e $JAVA_CMD \
- -Djava.util.logging.config.file="$logpropfile" \
- $JVM_ARGS `makeCommonOptions` -Dsettings.common.http.port=$HTTPPORT \
- -Dsettings.common.remoteFile.port=$FILETRANSFERPORT \
- -classpath $CLASSPATH $otherargs dk.netarkivet.$app &
- WINDOWPOS=$(( $WINDOWPOS + 1 ));
- JMXPORT=$(( $JMXPORT + 1 ));
- HTTPPORT=$(( $HTTPPORT + 1 ));
- FILETRANSFERPORT=$(( $FILETRANSFERPORT + 1 ))
-}
-
-## Start HarvestController
-## The HarvestControllerServer takes some specific parameters
-# Arg 1 is the consecutive number of this HarvestController
-# Arg 2 is the priority (HIGH or LOW, corresponding to selective or snapshot)
-function startHarvestApp {
- local hcsid priority prioritysetting portsetting runsetting title;
- local dirsetting hcstart startscript scriptfile;
- hcsid=$1;
- priority=$2;
- priority_settings=-Dsettings.harvester.harvesting.harvestControllerPriority=${priority}PRIORITY;
- portsetting="-Dsettings.harvester.harvesting.queuePriority=${priority}PRIORITY \
- -Dsettings.common.applicationInstanceId=$2 \
- -Dsettings.common.http.port=$HTTPPORT \
- -Dsettings.harvester.harvesting.heritrix.guiPort=$HERITRIXPORT \
- -Dsettings.harvester.harvesting.heritrix.jmxPort=$(( $HERITRIXPORT + 1 ))";
- title="Harvest Controller (Priority ${priority})";
- logpropfile="$ARCREP_HOME/log/log.prop.HarvestController-$HTTPPORT"
- sed 's!\(java.util.logging.FileHandler.pattern=\).*!\1'$ARCREP_HOME'/log/HarvestController-'$HTTPPORT'.log!;' <$ARCREP_HOME/log.prop > "$logpropfile"
- dirsetting="-Dsettings.harvester.harvesting.serverDir=server$hcsid \
- -Dsettings.harvester.harvesting.oldjobsDir=oldjobs$hcsid";
-
- hcstart="$JAVA_CMD `makeCommonOptions` $JVM_ARGS -classpath $CLASSPATH \
- -Djava.util.logging.config.file=\"$logpropfile\" \
- $prioritysetting $portsetting $dirsetting \
- dk.netarkivet.harvester.harvesting.HarvestControllerApplication";
- scriptfile=./hcs${hcsid}.sh;
- startscript="$XTERM_CMD $XTERM_ARGS -geometry $TERM_SIZE`makeXtermOffset` -title \"$title\" \
- -e $hcstart &";
- echo "$startscript" > $scriptfile;
- chmod 755 $scriptfile;
- $scriptfile;
- JMXPORT=$(( $JMXPORT + 1 ));
- HERITRIXPORT=$(( $HERITRIXPORT + 2 ));
- WINDOWPOS=$(( $WINDOWPOS + 1 ));
- HTTPPORT=$(( $HTTPPORT + 1 ));
-}
-
-## Clean up and copy harvest definition data
-
-## Remove and recopy various settings etc.
-## Not done if KEEPDATA is set and we have already run at least once.
-if [ -z "$KEEPDATA" -o ! -e $ARCREP_HOME/data/working ]; then
- rm -rf $ARCREP_HOME/data/working
- cp -r $ARCREP_HOME/data/originals $ARCREP_HOME/data/working
- mkdir -p $ARCREP_HOME/lib
- cp -r $NETARCHIVEDIR/lib/heritrix $ARCREP_HOME/lib
-
- ## Remove and unzip the embedded database
- rm -rf $ARCREP_HOME/data/working/harvestdefinitionbasedir/fullhddb
- unzip -qou -d $ARCREP_HOME/data/working/harvestdefinitionbasedir/ \
- $NETARCHIVEDIR/harvestdefinitionbasedir/fullhddb.jar
-
- ## Clean up other stuff left behind
-
- ## Clean up old logs
- rm -rf $ARCREP_HOME/log/* $ARCREP_HOME/derby.log
-
- ## Clean up everything else left behind by old harvests
- rm -rf $ARCREP_HOME/admin.data $ARCREP_HOME/server* \
- $ARCREP_HOME/bitarchive* $ARCREP_HOME/oldjobs* $ARCREP_HOME/cache
-fi
-
-chmod 600 $ARCREP_HOME/quickstart.jmxremote.password
-mkdir -p $ARCREP_HOME/log
-
-## Clean up log locks
-rm -f $ARCREP_HOME/log/*.lck
-
-## Clean up temporary things left behind
-rm -rf $ARCREP_HOME/hcs*.sh
-
-## JVM arguments for all processes
-## Includes a simple indicator of the fact that this is a simple_harvest process
-JVM_ARGS="-Xmx1512m -Ddk.netarkivet.settings.file=$ARCREP_HOME/settings.xml \
- -Dsimple.harvest.indicator=0"
-
-## Classpath
-CLASSPATH=:$NETARCHIVEDIR/lib/dk.netarkivet.archive.jar:$NETARCHIVEDIR/lib/dk.netarkivet.viewerproxy.jar:$NETARCHIVEDIR/lib/dk.netarkivet.harvester.jar:$NETARCHIVEDIR/lib/dk.netarkivet.monitor.jar
-
-export CLASSPATH
-
-## Term size
-TERM_SIZE=80x24
-
-## Initial window placement count, must be ++'d to get a new window position
-export WINDOWPOS=0
-
-## Restart broker
-##
-killall -q -9 `basename $IMQ`
-sleep 2
-$XTERM_CMD $HOLD -geometry $TERM_SIZE+`makeXtermOffset` -title " JMS Broker" \
- -e $IMQ -reset store -tty &
-WINDOWPOS=$(( $WINDOWPOS + 1 ))
-echo Waiting for IMQ broker to start, please ignore messages.
-while ! telnet localhost 7676 2>&1 | grep 'portmapper tcp' ; do
- sleep 1
-done
-
-## Start Bitarchive
-startApp Bitarchive archive.bitarchive.BitarchiveApplication
-
-## Start ArcRepository
-startApp ArcRepository archive.arcrepository.ArcRepositoryApplication
-
-## Start IndexServer
-startApp IndexServer archive.indexserver.IndexServerApplication
-
-## Start GUIApplication
-startApp GUIApplication common.webinterface.GUIApplication
-
-# Start viewerproxy
-startApp Viewerproxy viewerproxy.ViewerProxyApplication
-
-## Start two harvesters
-startHarvestApp 1 LOW
-
-startHarvestApp 2 HIGH
-
-## Start BitarchiveMonitor
-startApp BitarchiveMonitor archive.bitarchive.BitarchiveMonitorApplication
Deleted: trunk/scripts/simple_harvest/killhard.sh
===================================================================
--- trunk/scripts/simple_harvest/killhard.sh 2009-11-20 14:13:33 UTC (rev 1132)
+++ trunk/scripts/simple_harvest/killhard.sh 2009-11-20 14:43:27 UTC (rev 1133)
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-## $Id$
-## $Revision$
-## $Date$
-## $Author$
-##
-## The Netarchive Suite - Software to harvest and preserve websites
-## Copyright 2004-2009 Det Kongelige Bibliotek and Statsbiblioteket, Denmark
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-ps -wweo pid,command | grep simple.harvest.indicator | sed 's/^[ ^t]*//' | cut -d ' ' -f 1,1 | xargs kill -9
-ps -wweo pid,command | grep "JMS Broker" | sed 's/^[ ^t]*//' | cut -d ' ' -f 1,1 | xargs kill -9
Deleted: trunk/scripts/simple_harvest/killharvest.sh
===================================================================
--- trunk/scripts/simple_harvest/killharvest.sh 2009-11-20 14:13:33 UTC (rev 1132)
+++ trunk/scripts/simple_harvest/killharvest.sh 2009-11-20 14:43:27 UTC (rev 1133)
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-## $Id$
-## $Revision$
-## $Date$
-## $Author$
-##
-## The Netarchive Suite - Software to harvest and preserve websites
-## Copyright 2004-2009 Det Kongelige Bibliotek and Statsbiblioteket, Denmark
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-ps -wweo pid,command | grep simple.harvest.indicator | sed 's/^[ ^t]*//' | cut -d ' ' -f 1,1 | xargs kill
-ps -wweo pid,command | grep "JMS Broker" | sed 's/^[ ^t]*//' | cut -d ' ' -f 1,1 | xargs kill
Deleted: trunk/scripts/simple_harvest/log.prop
===================================================================
--- trunk/scripts/simple_harvest/log.prop 2009-11-20 14:13:33 UTC (rev 1132)
+++ trunk/scripts/simple_harvest/log.prop 2009-11-20 14:43:27 UTC (rev 1133)
@@ -1,62 +0,0 @@
-## $Id$
-## $Revision$
-## $Date$
-## $Author$
-##
-## The Netarchive Suite - Software to harvest and preserve websites
-## Copyright 2004-2009 Det Kongelige Bibliotek and Statsbiblioteket, Denmark
-##
-## This library is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Lesser General Public
-## License as published by the Free Software Foundation; either
-## version 2.1 of the License, or (at your option) any later version.
-##
-## This library 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
-## Lesser General Public License for more details.
-##
-## You should have received a copy of the GNU Lesser General Public
-## License along with this library; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-#define Handlers
-handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler,dk.netarkivet.monitor.logging.CachingLogHandler
-#define default logging level
-.level=INFO
-
-#setup the File Handler
-java.util.logging.FileHandler.level=FINE
-java.util.logging.FileHandler.pattern=./log/APPID%u.log
-java.util.logging.FileHandler.limit=1000000
-java.util.logging.FileHandler.count=100
-java.util.logging.FileHandler.append=true
-java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
-
-#setup the Console Handler
-java.util.logging.ConsoleHandler.level=INFO
-
-#Give properties to CachingLogHandler
-dk.netarkivet.monitor.logging.CachingLogHandler.formatter=java.util.logging.SimpleFormatter
-dk.netarkivet.monitor.logging.CachingLogHandler.level=INFO
-
-#define logging levels
-org.level=WARNING
-org.archive.level=WARNING
-org.archive.io.arc.level=SEVERE
-org.archive.crawler.filer.level=SEVERE
-org.archive.crawler.framework.Filter.level=SEVERE
-org.archive.crawler.framework.ToeThread.level=SEVERE
-org.archive.crawler.prefetch.QuotaEnforcer.level=WARNING
-org.apache.jsp.level=FINE
-org.mortbay.jetty.servlet.ServletHandler.level=WARNING
-dk.netarkivet.level=FINE
-dk.netarkivet.common.distribute.JMSConnection.level=INFO
-sun.jmx.level=WARNING
-Harvest\ Definition.level=SEVERE
-Bit\ Preservation.level=SEVERE
-History.level=SEVERE
-QA.level=SEVERE
-Status.level=SEVERE
-dk.netarkivet.archive.bitarchive.level=FINE
\ No newline at end of file
Deleted: trunk/scripts/simple_harvest/quickstart.jmxremote.access
===================================================================
--- trunk/scripts/simple_harvest/quickstart.jmxremote.access 2009-11-20 14:13:33 UTC (rev 1132)
+++ trunk/scripts/simple_harvest/quickstart.jmxremote.access 2009-11-20 14:43:27 UTC (rev 1133)
@@ -1,48 +0,0 @@
-######################################################################
-# Default Access Control File for Remote JMX(TM) Monitoring
-######################################################################
-#
-# Access control file for Remote JMX API access to monitoring.
-# This file defines the allowed access for different roles. The
-# password file (jmxremote.password by default) defines the roles and their
-# passwords. To be functional, a role must have an entry in
-# both the password and the access files.
-#
-# Default location of this file is $JRE/lib/management/jmxremote.access
-# You can specify an alternate location by specifying a property in
-# the management config file $JRE/lib/management/management.properties
-# (See that file for details)
-#
-# The file format for password and access files is syntactically the same
-# as the Properties file format. The syntax is described in the Javadoc
-# for java.util.Properties.load.
-# Typical access file has multiple lines, where each line is blank,
-# a comment (like this one), or an access control entry.
-#
-# An access control entry consists of a role name, and an
-# associated access level. The role name is any string that does not
-# itself contain spaces or tabs. It corresponds to an entry in the
-# password file (jmxremote.password). The access level is one of the
-# following:
-# "readonly" grants access to read attributes of MBeans.
-# For monitoring, this means that a remote client in this
-# role can read measurements but cannot perform any action
-# that changes the environment of the running program.
-# "readwrite" grants access to read and write attributes of MBeans,
-# to invoke operations on them, and to create or remove them.
-# This access should be granted to only trusted clients,
-# since they can potentially interfere with the smooth
-# operation of a running program
-#
-# A given role should have at most one entry in this file. If a role
-# has no entry, it has no access.
-# If multiple entries are found for the same role name, then the last
-# access entry is used.
-#
-#
-# Default access control entries:
-# o The "monitorRole" role has readonly access.
-# o The "controlRole" role has readwrite access.
-
-monitorRole readonly
-controlRole readwrite
Deleted: trunk/scripts/simple_harvest/quickstart.jmxremote.password
===================================================================
--- trunk/scripts/simple_harvest/quickstart.jmxremote.password 2009-11-20 14:13:33 UTC (rev 1132)
+++ trunk/scripts/simple_harvest/quickstart.jmxremote.password 2009-11-20 14:43:27 UTC (rev 1133)
@@ -1,63 +0,0 @@
-# ----------------------------------------------------------------------
-# Template for jmxremote.password
-#
-# o Copy this template to jmxremote.password
-# o Set the user/password entries in jmxremote.password
-# o Change the permission of jmxremote.password to read-only
-# by the owner.
-#
-# See below for the location of jmxremote.password file.
-# ----------------------------------------------------------------------
-
-##############################################################
-# Password File for Remote JMX Monitoring
-##############################################################
-#
-# Password file for Remote JMX API access to monitoring. This
-# file defines the different roles and their passwords. The access
-# control file (jmxremote.access by default) defines the allowed
-# access for each role. To be functional, a role must have an entry
-# in both the password and the access files.
-#
-# Default location of this file is $JRE/lib/management/jmxremote.password
-# You can specify an alternate location by specifying a property in
-# the management config file $JRE/lib/management/management.properties
-# or by specifying a system property (See that file for details).
-
-
-##############################################################
-# File permissions of the jmxremote.password file
-##############################################################
-# Since there are cleartext passwords stored in this file,
-# this file must be readable by ONLY the owner,
-# otherwise the program will exit with an error.
-#
-# The file format for password and access files is syntactically the same
-# as the Properties file format. The syntax is described in the Javadoc
-# for java.util.Properties.load.
-# Typical password file has multiple lines, where each line is blank,
-# a comment (like this one), or a password entry.
-#
-#
-# A password entry consists of a role name and an associated
-# password. The role name is any string that does not itself contain
-# spaces or tabs. The password is again any string that does not
-# contain spaces or tabs. Note that passwords appear in the clear in
-# this file, so it is a good idea not to use valuable passwords.
-#
-# A given role should have at most one entry in this file. If a role
-# has no entry, it has no access.
-# If multiple entries are found for the same role name, then the last one
-# is used.
-#
-# In a typical installation, this file can be read by anybody on the
-# local machine, and possibly by people on other machines.
-# For # security, you should either restrict the access to this file,
-# or specify another, less accessible file in the management config file
-# as described above.
-#
-# Following are two commented-out entries. The "monitorRole" role has
-# password "QED". The "controlRole" role has password "R&D".
-#
-monitorRole JMX_MONITOR_ROLE_PASSWORD_PLACEHOLDER
-controlRole JMX_CONTROL_ROLE_PASSWORD_PLACEHOLDER
\ No newline at end of file
Deleted: trunk/scripts/simple_harvest/quickstart.security.policy
===================================================================
--- trunk/scripts/simple_harvest/quickstart.security.policy 2009-11-20 14:13:33 UTC (rev 1132)
+++ trunk/scripts/simple_harvest/quickstart.security.policy 2009-11-20 14:43:27 UTC (rev 1133)
@@ -1,47 +0,0 @@
-grant codeBase "file:${java.home}/-" {
- permission java.security.AllPermission;
-};
-
-grant principal javax.management.remote.JMXPrincipal "monitorRole" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${dk.netarkivet.quickstart.basedir}/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${dk.netarkivet.quickstart.basedir}/scripts/simple_harvest/lib/heritrix/lib/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${dk.netarkivet.quickstart.basedir}/scripts/simple_harvest/tests/commontempdir/Status/jsp/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${dk.netarkivet.quickstart.basedir}/scripts/simple_harvest/tests/commontempdir/QA/jsp/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${dk.netarkivet.quickstart.basedir}/scripts/simple_harvest/tests/commontempdir/History/jsp/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${dk.netarkivet.quickstart.basedir}/scripts/simple_harvest/tests/commontempdir/HarvestDefinition/jsp/-" {
- permission java.security.AllPermission;
-};
-
-grant codeBase "file:${dk.netarkivet.quickstart.basedir}/scripts/simple_harvest/tests/commontempdir/BitPreservation/jsp/-" {
- permission java.security.AllPermission;
-};
-
-/* These permissions allow third-party batch classes to read the bitarchive */
-grant {
- permission java.io.FilePermission "${dk.netarkivet.quickstart.basedir}/scripts/simple_harvest/bitarchive1/filedir/*", "read";
- permission java.io.FilePermission "${dk.netarkivet.quickstart.basedir}/scripts/simple_harvest/bitarchive2/filedir/*", "read";
-};
-
-/* This allows third-party batch classes to figure out which location they're at
-*/
-grant {
- permission java.util.PropertyPermission "settings.common.thisPhysicalLocation", "read";
-};
Deleted: trunk/scripts/simple_harvest/settings.xml
===================================================================
--- trunk/scripts/simple_harvest/settings.xml 2009-11-20 14:13:33 UTC (rev 1132)
+++ trunk/scripts/simple_harvest/settings.xml 2009-11-20 14:43:27 UTC (rev 1133)
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * File: $Id$
- * Revision: $Revision$
- * Author: $Author$
- * Date: $Date$
- *
- * The Netarchive Suite - Software to harvest and preserve websites
- * Copyright 2004-2009 Det Kongelige Bibliotek and Statsbiblioteket, Denmark
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
--->
-<!--
- This file contains the settings used by the NetarchiveSuite Quick Start
- system.
--->
-<settings>
- <common>
- <environmentName>QUICKSTART</environmentName>
- <tempDir>./tests/commontempdir</tempDir>
- <remoteFile>
- <class>dk.netarkivet.common.distribute.HTTPRemoteFile</class>
- <port>5442</port>
- </remoteFile>
- <jms>
- <class>dk.netarkivet.common.distribute.JMSConnectionSunMQ</class>
- <broker>localhost</broker>
- <port>7676</port>
- </jms>
- <http>
- <port>8076</port>
- </http>
- <arcrepositoryClient>
- <class>dk.netarkivet.archive.arcrepository.distribute.JMSArcRepositoryClient</class>
- <getTimeout>60000</getTimeout>
- <storeRetries>3</storeRetries>
- <storeTimeout>3600000</storeTimeout>
- </arcrepositoryClient>
- <monitorregistryClient>
- <class>dk.netarkivet.monitor.distribute.JMSMonitorRegistryClient</class>
- <reregisterdelay>1</reregisterdelay>
- </monitorregistryClient>
- <indexClient>
- <class>dk.netarkivet.archive.indexserver.distribute.IndexRequestClient</class>
- <indexRequestTimeout>43200000</indexRequestTimeout>
- </indexClient>
- <cacheDir>cache</cacheDir>
- <processTimeout>5000</processTimeout>
- <notifications>
- <class>dk.netarkivet.common.utils.PrintNotifications</class>
- <sender>edit at this.mail.address</sender>
- <receiver>edit at this.mail.address</receiver>
- </notifications>
- <freespaceprovider>
- <class>dk.netarkivet.common.utils.DefaultFreeSpaceProvider</class>
- </freespaceprovider>
- <mail>
- <server>your.mail.server</server>
- </mail>
- <jmx>
- <port>8100</port>
- <rmiPort>8200</rmiPort>
- <passwordFile>scripts/simple_harvest/quickstart.jmxremote.password</passwordFile>
- <accessFile>scripts/simple_harvest/quickstart.jmxremote.access</accessFile>
- <timeout>120</timeout>
- </jmx>
- <webinterface>
- <language>
- <locale>da</locale>
- <name>Dansk</name>
- </language>
- <language>
- <locale>en</locale>
- <name>English</name>
- </language>
- <language>
- <locale>de</locale>
- <name>Deutsch</name>
- </language>
- <language>
- <locale>it</locale>
- <name>Italiano</name>
- </language>
- <language>
- <locale>fr</locale>
- <name>Français</name>
- </language>
- <siteSection>
- <class>dk.netarkivet.harvester.webinterface.DefinitionsSiteSection</class>
- <webapplication>../../webpages/HarvestDefinition.war</webapplication>
- </siteSection>
- <siteSection>
- <class>dk.netarkivet.harvester.webinterface.HistorySiteSection</class>
- <webapplication>../../webpages/History.war</webapplication>
- </siteSection>
- <siteSection>
- <class>dk.netarkivet.archive.webinterface.BitPreservationSiteSection</class>
- <webapplication>../../webpages/BitPreservation.war</webapplication>
- </siteSection>
- <siteSection>
- <class>dk.netarkivet.viewerproxy.webinterface.QASiteSection</class>
- <webapplication>../../webpages/QA.war</webapplication>
- </siteSection>
- <siteSection>
- <class>dk.netarkivet.monitor.webinterface.StatusSiteSection</class>
- <webapplication>../../webpages/Status.war</webapplication>
- </siteSection>
- </webinterface>
- <database>
- <url>jdbc:derby:data/working/harvestdefinitionbasedir/fullhddb</url>
- <class>dk.netarkivet.harvester.datamodel.DerbyEmbeddedSpecifics</class>
- <backupInitHour>3</backupInitHour>
- </database>
- <repository>
- <limitForRecordDatatransferInFile>10485760</limitForRecordDatatransferInFile>
- </repository>
- <replicas>
- <replica>
- <replicaId>SH</replicaId>
- <replicaType>bitarchive</replicaType>
- <replicaName>SHB</replicaName>
- </replica>
- </replicas>
- <useReplicaId>SH</useReplicaId>
- <thisPhysicalLocation>LOCAL</thisPhysicalLocation>
- <applicationName>NA</applicationName>
- </common>
- <harvester>
- <datamodel>
- <domain>
- <defaultSeedlist>defaultseeds</defaultSeedlist>
- <defaultConfig>defaultconfig</defaultConfig>
- <defaultOrderxml>default_orderxml</defaultOrderxml>
- <defaultMaxrate>100</defaultMaxrate>
- <defaultMaxbytes>10000000</defaultMaxbytes>
- <defaultMaxobjects>-1</defaultMaxobjects>
- </domain>
- </datamodel>
- <scheduler>
- <errorFactorPrevResult>10</errorFactorPrevResult>
- <errorFactorBestGuess>20</errorFactorBestGuess>
- <expectedAverageBytesPerObject>38000</expectedAverageBytesPerObject>
- <maxDomainSize>5000</maxDomainSize>
- <jobs>
- <maxRelativeSizeDifference>100</maxRelativeSizeDifference>
- <minAbsoluteSizeDifference>2000</minAbsoluteSizeDifference>
- <maxTotalSize>2000000</maxTotalSize>
- </jobs>
- <configChunkSize>10000</configChunkSize>
- <splitByObjectLimit>false</splitByObjectLimit>
- </scheduler>
- <harvesting>
- <serverDir>server</serverDir>
- <minSpaceLeft>400000000</minSpaceLeft>
- <oldjobsDir>oldjobs</oldjobsDir>
- <queuePriority>HIGHPRIORITY</queuePriority>
- <heritrix>
- <inactivityTimeout>1800</inactivityTimeout>
- <noresponseTimeout>1800</noresponseTimeout>
- <adminName>admin</adminName>
- <adminPassword>adminPassword</adminPassword>
- <guiPort>8090</guiPort>
- <jmxPort>8091</jmxPort>
- <jmxUsername>controlRole</jmxUsername>
- <jmxPassword>JMX_CONTROL_ROLE_PASSWORD_PLACEHOLDER</jmxPassword>
- <heapSize>1598M</heapSize>
- </heritrix>
- </harvesting>
- </harvester>
- <archive>
- <arcrepository>
- <baseDir>.</baseDir>
- </arcrepository>
- <bitarchive>
- <minSpaceLeft>2000000</minSpaceLeft>
- <baseFileDir>bitarchive1</baseFileDir>
- <baseFileDir>bitarchive2</baseFileDir>
- <heartbeatFrequency>1000</heartbeatFrequency>
- <acceptableHeartbeatDelay>60000</acceptableHeartbeatDelay>
- <batchMessageTimeout>1209600000</batchMessageTimeout>
- <thisCredentials>Password for changing things in the archive</thisCredentials>
- </bitarchive>
- <bitpreservation>
- <baseDir>bitpreservation</baseDir>
- </bitpreservation>
- </archive>
- <viewerproxy>
- <baseDir>viewerproxy</baseDir>
- </viewerproxy>
- <monitor>
- <logging>
- <historySize>100</historySize>
- </logging>
- </monitor>
-</settings>
_______________________________________________
Netarchivesuite-commits mailing list
Netarchivesuite-commits at lists.gforge.statsbiblioteket.dk
https://lists.gforge.statsbiblioteket.dk/mailman/listinfo/netarchivesuite-commits
More information about the Netarchivesuite-devel
mailing list