r5008 - in trunk: gnue-appserver/src gnue-dbtools/src/loader gnue-dbtools/src/sql gnue-designer/src gnue-forms/src gnue-reports/src/client

[jcater]

Author: jcater
Date: 2003-12-19 15:33:36 -0600 (Fri, 19 Dec 2003)
New Revision: 5008

Modified:
   trunk/gnue-appserver/src/geasRpcServer.py
   trunk/gnue-dbtools/src/loader/Loader.py
   trunk/gnue-dbtools/src/sql/Client.py
   trunk/gnue-designer/src/Designer.py
   trunk/gnue-forms/src/GFClient.py
   trunk/gnue-reports/src/client/GRRun.py
Log:
moved the command-line options for username/password into gnue-common; any gnue 
app can now add USE_DATABASE_OPTIONS=1 to get this functionality; fixed minor 
spelling mistakes

Modified: trunk/gnue-appserver/src/geasRpcServer.py
===================================================================
--- trunk/gnue-appserver/src/geasRpcServer.py   2003-12-19 20:12:35 UTC (rev 
5007)
+++ trunk/gnue-appserver/src/geasRpcServer.py   2003-12-19 21:33:36 UTC (rev 
5008)
@@ -71,6 +71,8 @@
       _('Enable appservers web frontend. Just works for the rpc-type XMLRPC. 
')+
       _('The webfrontend is at the same port as XMLRPC. ')]]
 
+#  USE_DATABASE_OPTIONS = 1 # Conflicts with the existing username and password
+
   # ---------------------------------------------------------------------------
   # Initialize the object
   # ---------------------------------------------------------------------------
@@ -172,7 +174,7 @@
       while 1 == 1:
         time.sleep (1999999)
     except KeyboardInterrupt:
-      print "Appserver is shuting down....ok"
+      print "Appserver is shutting down....ok"
 
   # ---------------------------------------------------------------------------
   # Request a session manager (called once for every connection)
@@ -199,7 +201,7 @@
     print _("\nGNUe Application Server is running a simple self test\n")
     print _("=====================================================\n")
 
-    print _("PREREQUISE: You have to populate the backend db with ")
+    print _("PREREQUISITE: You have to populate the backend db with ")
     print _('the "address_person" example.\n')
 
     print _("Step 1: Startup Session Manager\n")

Modified: trunk/gnue-dbtools/src/loader/Loader.py
===================================================================
--- trunk/gnue-dbtools/src/loader/Loader.py     2003-12-19 20:12:35 UTC (rev 
5007)
+++ trunk/gnue-dbtools/src/loader/Loader.py     2003-12-19 21:33:36 UTC (rev 
5008)
@@ -49,7 +49,8 @@
   COMMAND_OPTIONS = [      ]
   SUMMARY = \
      _("A simple data loader")
-
+  USE_DATABASE_OPTIONS =1
+  
   def __init__(self, connections=None):
       # Intialize the event control system
       self.eventController = events.EventController()

Modified: trunk/gnue-dbtools/src/sql/Client.py
===================================================================
--- trunk/gnue-dbtools/src/sql/Client.py        2003-12-19 20:12:35 UTC (rev 
5007)
+++ trunk/gnue-dbtools/src/sql/Client.py        2003-12-19 21:33:36 UTC (rev 
5008)
@@ -52,6 +52,7 @@
   COMMAND_OPTIONS = [ ]
   SUMMARY = \
      _("GNUe SQL Shell is the sql shell interpreter for the GNUe project.")
+  USE_DATABASE_OPTIONS = 1
 
   def __init__(self, connections=None):
     self.eventController = events.EventController()

Modified: trunk/gnue-designer/src/Designer.py
===================================================================
--- trunk/gnue-designer/src/Designer.py 2003-12-19 20:12:35 UTC (rev 5007)
+++ trunk/gnue-designer/src/Designer.py 2003-12-19 21:33:36 UTC (rev 5008)
@@ -88,8 +88,8 @@
       [ 'new', 'n', 'new', 1, None, 'module',
           _('Starts up opening a new instance of <module>, where module can be 
forms, reports, schema, etc.') ],
       ]
-
   USAGE = GClientApp.USAGE + " [file] [file] ..."
+  USE_DATABASE_OPTIONS = 1
 
   def __init__(self):
     GClientApp.__init__(self, application="forms",defaults=ConfigOptions)

Modified: trunk/gnue-forms/src/GFClient.py
===================================================================
--- trunk/gnue-forms/src/GFClient.py    2003-12-19 20:12:35 UTC (rev 5007)
+++ trunk/gnue-forms/src/GFClient.py    2003-12-19 21:33:36 UTC (rev 5008)
@@ -59,6 +59,7 @@
       ]
   SUMMARY = \
      _("GNUe Forms is the primary user interface to the GNU Enterprise 
system.")
+  USE_DATABASE_OPTIONS = 1
 
   def __init__(self, connections=None):
     GClientApp.__init__(self, connections,'forms',ConfigOptions)

Modified: trunk/gnue-reports/src/client/GRRun.py
===================================================================
--- trunk/gnue-reports/src/client/GRRun.py      2003-12-19 20:12:35 UTC (rev 
5007)
+++ trunk/gnue-reports/src/client/GRRun.py      2003-12-19 21:33:36 UTC (rev 
5008)
@@ -113,20 +113,11 @@
           'Do not output GNUe Report''s runtime XML markup information.  If 
specified, '
           'then the GRD''s layout section will be processed and output '
           'as-is; i.e., without any additional information added by '
-          'GNUe Reports.'],
-      [ 'user', 'u', 'user', 1, '', 'name',
-          'Username used to log into the database.  Note that if '
-          'specified, this will be used for all databases.  If not '
-          'supplied, the program will prompt for username.'],
-      [ 'password', None, 'pass', 1, '', 'passwd',
-          'Password used to log into the database.  Note that if '
-          'specified, this will be used for all databases.  If not '
-          'supplied, the program will prompt for password.\nNOTE: '
-          'SUPPLYING A PASSWORD VIA THE COMMAND LINE MAY BE CONSIDERED '
-          'A SECURITY RISK.' ] ]
+          'GNUe Reports.'], ]
   SUMMARY = \
      "GNUe Reports is the primary reporting agent of the GNU Enterprise 
system."
   USAGE = GClientApp.USAGE + " file [param1=val] [param2=val] ..."
+  USE_DATABASE_OPTIONS = 1
 
   #
   # Initialize the class
@@ -213,15 +204,6 @@
       lh = NoLoginHandler()
       self.getConnectionManager().setLoginHandler(lh)
 
-    try:
-      if len(self.OPTIONS['user']):
-        lh.defaults['_username'] = self.OPTIONS['user']
-      if len(self.OPTIONS['password']):
-        lh.defaults['_password'] = self.OPTIONS['password']
-    except:
-      pass
-
-
     #
     # Now, run an engine instance
     #
@@ -230,7 +212,7 @@
     if not self.OPTIONS["standalone"]:
      try:
        rep_engine = GREngine(self.getConnectionManager())
-       rep_engine.processReport(reportfile, 
+       rep_engine.processReport(reportfile,
                                 destination = destination,
                                 destinationType = destinationType,
                                 destinationOptions = destinationOptions,