Fresco/Berlin/server devices.cc,1.6,1.7 kits.cc,1.14,1.15 server.cc,1.70,1.71

Update of /cvs/fresco/Fresco/Berlin/server
In directory purcel:/tmp/cvs-serv9791/Berlin/server

Modified Files:
	devices.cc kits.cc server.cc 
Log Message:
Factor code from server.cc into RCManager, to enable use across all Berlin binaries. Modify pinyin demo to not use RCManager (for now) - its a Berlin library, not something that clients should use.


Index: devices.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/server/devices.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- devices.cc	29 Oct 2002 02:28:48 -0000	1.6
+++ devices.cc	14 Apr 2003 00:25:05 -0000	1.7
@@ -53,10 +53,10 @@
   argv += argo;
   if (getopt.is_set("version")) { std::cout << "version is " << version << std::endl; return 0;}
   if (getopt.is_set("help")) { getopt.usage(); return 0;}
-  std::string value;
-  if (getopt.get("resource", &value)) RCManager::read(Prague::Path::expand_user(value));
 
-  value = "";
+  RCManager::setup(getopt);
+
+  std::string value;
   getopt.get("console",&value);
   try { Console::open(value, argc, argv, PortableServer::POA::_nil(), 1, 1);}
 

Index: kits.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/server/kits.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kits.cc	18 Feb 2003 15:06:47 -0000	1.14
+++ kits.cc	14 Apr 2003 00:25:05 -0000	1.15
@@ -65,8 +65,8 @@
   argv += argo;
   if (getopt.is_set("version")) { std::cout << "version is " << version << std::endl; exit(0);}
   if (getopt.is_set("help")) { getopt.usage(); exit(0);}
-  std::string value;
-  if (getopt.get("resource", &value)) RCManager::read(Prague::Path::expand_user(value));
+
+  RCManager::setup(getopt);
 
   CORBA::PolicyList policies;
   ServerImpl *server = ServerImpl::create(PortableServer::POA::_nil(),policies);

Index: server.cc
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/server/server.cc,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- server.cc	26 Feb 2003 00:19:08 -0000	1.70
+++ server.cc	14 Apr 2003 00:25:05 -0000	1.71
@@ -26,7 +26,6 @@
 #include <Prague/Sys/Profiler.hh>
 #include <Prague/Sys/Timer.hh>
 #include <Prague/Sys/Path.hh>
-#include <Prague/Sys/User.hh>
 #include <Prague/Sys/Fork.hh>
 #include <Prague/Sys/GetOpt.hh>
 #include <Fresco/config.hh>
@@ -301,77 +300,10 @@
                                       << std::endl;
       }
   }
-  value = "";
   
-  // Find our resource file:
-  if (getopt.get("resource", &value))
-  {
-      // Load resourcefile given on the commandline:
-      try
-      {
-          value = Prague::Path::expand_user(value);
-          RCManager::read(value);
-          Logger::log(Logger::loader) << "Resourcefile \""
-                                      << value << "\" read."
-                                      << std::endl;
-      }
-      catch (const std::runtime_error &e)
-      {
-          std::cerr << "ERROR: Resourcefile \"" << value
-                    << "\" given on the commandline failed to load: "
-                    << e.what() << std::endl;
-          exit (1);
-      }
-  }
-  else
-  {
-      // Search for berlinrc in default places:
-      value = sysconfdir + "/berlinrc";
-
-      bool is_configured = 0;
-      try
-      {
-          RCManager::read(value);
-          is_configured = 1;
-          Logger::log(Logger::loader) << "Resourcefile \""
-                                      << value << "\" read."
-                                      << std::endl;
-
-      }
-      catch (const std::runtime_error &e)
-      {
-          std::cerr << "Warning: Default resourcefile \"" << value
-                    << "\" failed to load: "
-                    << e.what() << std::endl;
-      }
-
-      // FIXME: merge additional configuration:
-      if(getenv("BERLINRC")) value = std::string(getenv("BERLINRC"));
-      else value ="";
-
-      if (value.empty())
-          value = std::string(User().home()) + "/.berlin";
+  // Load the berlin rc files
+  RCManager::setup(getopt);
 
-      try
-      {
-          if (!is_configured) 
-          {
-              RCManager::read(value);
-              Logger::log(Logger::loader) << "Resourcefile \""
-                                          << value << "\" read."
-                                          << std::endl;
-          }
-      }
-      catch (const std::runtime_error &e)
-      {
-          std::cerr << "ERROR: System resourcefile is missing and "
-                    << "user's resourcefile \"" << value
-                    << "\" failed to load too: "
-                    << e.what() << std::endl;
-          exit(1);
-      }
-  }
-  
   if (getopt.is_set("tracer"))
   {
       Tracer::logging(true);