Remaining doc/test/script updates.

diff --git a/org.glite.jp.index/config/startup b/org.glite.jp.index/config/startup
index 569ba5c..4680b41 100755 (executable)
--- a/org.glite.jp.index/config/startup
+++ b/org.glite.jp.index/config/startup
@@ -18,6 +18,7 @@ GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-${GLITE_LOCATION}/var}
 [ -n "$GLITE_JPIS_LOGFILE" ] || export GLITE_JPIS_LOGFILE=$GLITE_LOCATION_VAR/glite-jp-indexd.log
 pidfile="$GLITE_JPIS_PIDFILE"
 
+test -n "$GLITE_JPIS_CONFIG" || GLITE_JPIS_CONFIG="$GLITE_LOCATION/etc/glite-jpis-config.xml"
 test -n "$GLITE_JPIS_PORT" || GLITE_JPIS_PORT=8902
 test -n "$GLITE_JPIS_DB" || GLITE_JPIS_DB=jpis/@localhost:jpis
 test -n "$GLITE_JPIS_QT" || GLITE_JPIS_QT="both"
@@ -55,11 +56,6 @@ start()
 
         [ -z "$creds" ] && echo $0: WARNING: No credentials specified. Using default lookup which is dangerous. >&2
 
-        if test -z "$GLITE_JPIS_PS" ;then
-                echo 'Error: GLITE_JPIS_PS is not set'
-                echo FAILED
-                return 1
-        fi
        if [ ! -d "`dirname $GLITE_JPIS_PIDFILE`" ] 
        then 
                echo "Directory `dirname $GLITE_JPIS_PIDFILE` does not exist!"
@@ -79,6 +75,7 @@ start()
                -q $GLITE_JPIS_QT $creds $GLITE_JPIS_AUTH \
                -m $GLITE_JPIS_DB -p $GLITE_JPIS_PORT \
                -i $GLITE_JPIS_PIDFILE -o $GLITE_JPIS_LOGFILE \
+               -x $GLITE_JPIS_CONFIG
                " && echo " done" || echo " FAILED"
 }
 

diff --git a/org.glite.jp.index/doc/README b/org.glite.jp.index/doc/README
index 92ac673..2261d3c 100644 (file)
--- a/org.glite.jp.index/doc/README
+++ b/org.glite.jp.index/doc/README
@@ -70,7 +70,6 @@ some hard-coded options.
 The index server takes the following options:
 
 ./glite-jp-indexd [option]
-       -s, --ps-server  primary storage server address (http://hostname:port)
         -d, --debug      don't run as daemon, additional diagnostics
        -q, --query-type hist/cont/both (default history)       
         -n, --noauth     don't check user identity with result owner
@@ -78,9 +77,10 @@ The index server takes the following options:
         -p, --port       port to listen
         -i, --pidfile    file to store master pid
         -o, --logfile    file to store logs
+       -x, --config     file with server configuration
 
-Other parameters will be configurable in close future. Its
-current hard-coded values are in org.glite.jp.index/src/conf.[ch]
+The config file parameter is required. There is the example configuration in
+$GLITE_LOCATION/etc/glite-jpis-config.xml.
 
 
 Starting the daemon
@@ -91,8 +91,8 @@ Preferred way of starting the daemon is using start-up script
 in ~/.glite.conf) where many variables may be set to configure the daemon.
 The script takes following variables:
 
-GLITE_JPIS_PS          - location of JP-PS server (_required parameter_)
-                       (for example http://umbar.ics.muni.cz:8901)
+GLITE_JPIS_CONFIG      - server config file specification
+                       (default is $GLITE_LOCATION//etc/glite-jpis-config.xml)
 GLITE_JPIS_DEBUG       - setting to '-d' forces the daemon not to daemonize 
 GLITE_JPIS_QT          - defines query type 
                        'hist' ... history query

diff --git a/org.glite.jp.index/doc/glite-jp-indexd.sgml b/org.glite.jp.index/doc/glite-jp-indexd.sgml
index a0f2d83..a0713bd 100644 (file)
--- a/org.glite.jp.index/doc/glite-jp-indexd.sgml
+++ b/org.glite.jp.index/doc/glite-jp-indexd.sgml
@@ -82,14 +82,6 @@ With no options you get simple usage message as with <option>-h</option>.
 
                <variablelist>
                        <varlistentry>
-                               <term><option>-s</option>|<option>--ps-server</option></term>
-                               <listitem><para>
-Primary storage server address
-(http://<replaceable>HOSTNAME:PORT</replaceable>).
-                               </para></listitem>
-                       </varlistentry>
-
-                       <varlistentry>
                                <term><option>-d</option>|<option>--debug</option></term>
                                <listitem><para>
 Don't run as daemon, additional diagnostics.
@@ -174,9 +166,9 @@ Preferred way of starting the daemon is using start-up script (<filename>config/
 
                <variablelist>
                        <varlistentry>
-                               <term>GLITE_JPIS_PS</term>
+                               <term>GLITE_JPIS_CONFIG</term>
                                <listitem><para>
-Location of JP-PS server (_required parameter_), for example http://umbar.ics.muni.cz:8901.
+Specifying config file. Default is <filename>$GLITE_LOCATION/etc/glite-jpis-config.xml</filename>
                                </para></listitem>
                        </varlistentry>
 

diff --git a/org.glite.jp.index/examples/query-tests/run-test.sh b/org.glite.jp.index/examples/query-tests/run-test.sh
index cfa335f..36cbb99 100755 (executable)
--- a/org.glite.jp.index/examples/query-tests/run-test.sh
+++ b/org.glite.jp.index/examples/query-tests/run-test.sh
@@ -219,6 +219,7 @@ create_db;
 run_is;
 import_db $GLITE_LOCATION/examples/query-tests/dump1.sql;
 run_test_query $GLITE_LOCATION/examples/query-tests/simple_query.in $GLITE_LOCATION/examples/query-tests/authz.out;
+drop_db;
 kill_is;
 
 echo -n "Query jobId test........... "