--- a/client/src/main/java/com/redhat/thermostat/client/Main.java	Thu Mar 29 17:49:30 2012 +0200
+++ b/client/src/main/java/com/redhat/thermostat/client/Main.java	Thu Mar 29 21:17:53 2012 +0200
@@ -48,6 +48,7 @@
 import javax.swing.SwingUtilities;
 
 import com.redhat.thermostat.client.appctx.ApplicationContext;
+import com.redhat.thermostat.client.config.ConnectionConfiguration;
 import com.redhat.thermostat.client.locale.LocaleResources;
 import com.redhat.thermostat.client.ui.ConnectionSelectionDialog;
 import com.redhat.thermostat.client.ui.LayoutDebugHelper;
@@ -82,15 +83,7 @@
             System.exit(-1);
         }
 
-        StartupConfiguration config = null;
-        try {
-            config = new StartupConfiguration(System.currentTimeMillis(), args);
-        } catch (LaunchException le) {
-            logger.log(Level.SEVERE,
-                    "Unable to instantiate startup configuration.",
-                    le);
-            System.exit(Constants.EXIT_CONFIGURATION_ERROR);
-        }
+        StartupConfiguration config = new ConnectionConfiguration();
         
         ConnectionProvider connProv = new MongoConnectionProvider(config);
         DAOFactory daoFactory = new MongoDAOFactory(connProv);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/src/main/java/com/redhat/thermostat/client/config/ConnectionConfiguration.java	Thu Mar 29 21:17:53 2012 +0200
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.client.config;
+
+import com.redhat.thermostat.common.config.StartupConfiguration;
+
+public class ConnectionConfiguration implements StartupConfiguration {
+
+    @Override
+    public String getDBConnectionString() {
+        // TODO: this needs to be read from preferences or from the agent
+        // configuration
+        return "mongodb://127.0.0.1:27518";
+    }
+}