[gnue] r7522 - trunk/gnue-integrator/src

[johannes]

Author: johannes
Date: 2005-05-04 08:00:26 -0500 (Wed, 04 May 2005)
New Revision: 7522

Modified:
   trunk/gnue-integrator/src/GIClient.py
Log:
Adopted for new GLoginHandler


Modified: trunk/gnue-integrator/src/GIClient.py
===================================================================
--- trunk/gnue-integrator/src/GIClient.py       2005-05-04 12:59:59 UTC (rev 
7521)
+++ trunk/gnue-integrator/src/GIClient.py       2005-05-04 13:00:26 UTC (rev 
7522)
@@ -34,6 +34,7 @@
 from gnue.common.apps import GDebug
 from gnue.common.utils.FileUtils import openResource
 from gnue.common.apps.GClientApp import *
+from gnue.common.datasources.GLoginHandler import SilentLoginHandler
 from gnue.integrator import VERSION
 
 from GIConfig import ConfigOptions
@@ -74,8 +75,7 @@
     except:
       self.handleStartupError ("No Integrator Definition File Specified.")
     
-    lh = NoLoginHandler()
-    self.getConnectionManager().setLoginHandler(lh)
+    self.getConnectionManager ().setLoginHandler (SilentLoginHandler ())
 
     fileHandle = openResource(mappingFile)
     mapping = loadMapping (fileHandle, self.connections)
@@ -88,28 +88,7 @@
 
     mapping.run()
 
-#
-# Login handler for --batch mode
-#
-from gnue.common.datasources import GLoginHandler
-class NoLoginHandler(GLoginHandler.LoginHandler):
 
-  defaults = {'_username': 'jan', '_password': None}
-
-  def getLogin(self, loginData, error):
-    val = {}
-    for prompt in loginData[2]:
-      if self.defaults.has_key(prompt[0])  and self.defaults[prompt[0]]:
-          val[prompt[0]] = self.defaults[prompt[0]]
-      else:
-          val[prompt[0]] = None
-    return val
-
-  def destroyLoginDialog(self):
-      pass
-
-
-
 if __name__ == '__main__':
   GIClient().run()