default db name changed (jpis1 -> jpis)

diff --git a/org.glite.jp.index/config/dbsetup.sh b/org.glite.jp.index/config/dbsetup.sh
index 5cf096b..e860b31 100755 (executable)
--- a/org.glite.jp.index/config/dbsetup.sh
+++ b/org.glite.jp.index/config/dbsetup.sh
@@ -5,10 +5,10 @@
 #
 
 # database
-mysqladmin -u root -p create jpis1
+mysqladmin -u root -p create jpis
 
 # user
-mysql -u root -p -e 'GRANT ALL on jpis1.* to jpis@localhost'
+mysql -u root -p -e 'GRANT ALL on jpis.* to jpis@localhost'
 
 # tables
-mysql -u jpis jpis1 < `dirname $0`/glite-jp-index-dbsetup.sql
+mysql -u jpis jpis < `dirname $0`/glite-jp-index-dbsetup.sql

diff --git a/org.glite.jp.index/config/startup b/org.glite.jp.index/config/startup
index 2596cdb..f9ff9d6 100755 (executable)
--- a/org.glite.jp.index/config/startup
+++ b/org.glite.jp.index/config/startup
@@ -19,7 +19,7 @@ GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-${GLITE_LOCATION}/var}
 pidfile="$GLITE_JPIS_PIDFILE"
 
 test -n "$GLITE_JPIS_PORT" || GLITE_JPIS_PORT=8902
-test -n "$GLITE_JPIS_DB" || GLITE_JPIS_DB=jpis/@localhost:jpis1
+test -n "$GLITE_JPIS_DB" || GLITE_JPIS_DB=jpis/@localhost:jpis
 test -n "$GLITE_JPIS_QT" || GLITE_JPIS_QT="both"
 #GLITE_JPIS_AUTH can have '-n' value to force indexd not to check auth
 #GLITE_JPIS_DEBUG can have '-d' value to force indexd not to deamonize

diff --git a/org.glite.jp.index/doc/README b/org.glite.jp.index/doc/README
index 6261664..cae8f41 100644 (file)
--- a/org.glite.jp.index/doc/README
+++ b/org.glite.jp.index/doc/README
@@ -22,7 +22,7 @@ interfaces defined in org.glite.jp.ws-interface. It is also based on
 org.glite.lb.server-bones.
 
 JP-IS consist from one stand-alone daemon (glite-jp-indexd) which is
-using MySQL database. Default db name is jpis1, all access is granted to
+using MySQL database. Default db name is jpis, all access is granted to
 user jpis.
 
 JP-IS interactions:
@@ -102,7 +102,7 @@ GLITE_JPIS_AUTH             - setting to '-n' forces the daemon not to check
                        authorisation
 GLITE_JPIS_PORT        - used port (default 8902)
 GLITE_JPIS_DB          - database connection string 
-                       (default jpis/@localhost:jpis1)
+                       (default jpis/@localhost:jpis)
 GLITE_JPIS_LOGFILE     - log file 
                        (default is $GLITE_LOCATION_VAR/log/glite-jp-indexd.log)
 GLITE_JPIS_PIDFILE     - pid file 

diff --git a/org.glite.jp.index/doc/glite-jp-indexd.sgml b/org.glite.jp.index/doc/glite-jp-indexd.sgml
index 3a28aac..1007bf4 100644 (file)
--- a/org.glite.jp.index/doc/glite-jp-indexd.sgml
+++ b/org.glite.jp.index/doc/glite-jp-indexd.sgml
@@ -128,7 +128,7 @@ Don't check user identity with result owner.
                        <varlistentry>
                                <term><option>-m</option>|<option>--mysql</option></term>
                                <listitem><para>
-Database connect string: <replaceable>USER/PASSWORD@HOST:DBNAME</replaceable> (default: <option>jpis/@localhost:jpis1</option>).
+Database connect string: <replaceable>USER/PASSWORD@HOST:DBNAME</replaceable> (default: <option>jpis/@localhost:jpis</option>).
                                </para></listitem>
                        </varlistentry>
 
@@ -247,7 +247,7 @@ Error (database or network initialisation for example).
                        <varlistentry>
                                <term>configure file for startup script</term>
                                <listitem><programlisting>GLITE_LOCATION_VAR=/opt/glite/var
-GLITE_JPIS_DB=jpis/@localhost:jpis1
+GLITE_JPIS_DB=jpis/@localhost:jpis
 GLITE_JPIS_PORT=8902
 GLITE_JPIS_LOGFILE=$GLITE_LOCATION_VAR/run/glite-jp-indexd.log
 GLITE_JPIS_PIDFILE=$GLITE_LOCATION_VAR/run/glite-jp-indexd.pid

diff --git a/org.glite.jp.index/src/db_ops.h b/org.glite.jp.index/src/db_ops.h
index 0569c72..e7353fc 100644 (file)
--- a/org.glite.jp.index/src/db_ops.h
+++ b/org.glite.jp.index/src/db_ops.h
@@ -9,7 +9,7 @@
 #include "context.h"
 
 
-#define GLITE_JP_IS_DEFAULTCS "jpis/@localhost:jpis1"
+#define GLITE_JP_IS_DEFAULTCS "jpis/@localhost:jpis"
 
 #define GLITE_JP_IS_STATE_HIST 1
 #define GLITE_JP_IS_STATE_CONT 2