take db user and name from configuration a build DBCS string from it

diff --git a/org.glite.deployment.jpis/config/scripts/glite-jpis-config.py b/org.glite.deployment.jpis/config/scripts/glite-jpis-config.py
index 7c347aa..eb75155 100755 (executable)
--- a/org.glite.deployment.jpis/config/scripts/glite-jpis-config.py
+++ b/org.glite.deployment.jpis/config/scripts/glite-jpis-config.py
@@ -285,8 +285,6 @@ def loadDefaults(params):
 
     params['GLITE_LOCATION'] = "/opt/glite"
     params['mysql.root.password'] = ""
-    params['jpis.database.name'] = "jpis"
-    params['jpis.database.username'] = "jpis"
     params['mysql.max_allowed_packet'] = "17"
     params['jpis.serviceName'] = 'JP IS Server service at %s' % glib.fq_hostname
     params['jpis.serviceType'] = 'org.glite.jp.index'
@@ -334,7 +332,7 @@ def set_env():
     glib.export('GLITE_JPIS_DEBUG',params['jpis.debug'])    
     glib.export('GLITE_JPIS_QT',params['jpis.qt'])    
     glib.export('GLITE_JPIS_AUTH',params['jpis.auth'])    
-    glib.export('GLITE_JPIS_DB',params['jpis.db'])    
+    glib.export('GLITE_JPIS_DB',"%s/@localhost:%s" % (params['jpis.database.username'], params['jpis.database.name']) )
     glib.export('GLITE_JPIS_PORT',params['jpis.port'])    
     glib.export('GLITE_JPIS_PIDFILE',params['jpis.pid.file'])    
     glib.export('GLITE_JPIS_LOGFILE',params['jpis.log.file'])

diff --git a/org.glite.deployment.jpis/config/templates/glite-jpis.cfg.xml b/org.glite.deployment.jpis/config/templates/glite-jpis.cfg.xml
index ca3e6b6..6eb3f38 100644 (file)
--- a/org.glite.deployment.jpis/config/templates/glite-jpis.cfg.xml
+++ b/org.glite.deployment.jpis/config/templates/glite-jpis.cfg.xml
@@ -61,9 +61,13 @@
                        description="setting to '-n' switches off authorization"
                        value=""/>
 
-               <jpis.db
-                       description="non-default JP IS DB contact string"
-                       value=""/>
+               <jpis.database.name
+                       description="JP IS DB name"
+                       value="jpis"/>
+
+               <jpis.database.username
+                       description="JP IS DB user"
+                       value="jpis"/>
 
                <jpis.port
                        description="non-default JP IS port"

diff --git a/org.glite.deployment.jpis/project/version.properties b/org.glite.deployment.jpis/project/version.properties
index b6ff6e2..809be8c 100644 (file)
--- a/org.glite.deployment.jpis/project/version.properties
+++ b/org.glite.deployment.jpis/project/version.properties
@@ -1,4 +1,4 @@
 
 module.version = 2.2.0
-module.age = 1
-                               
\ No newline at end of file
+module.age = 2
+