Index: /trunk/FACT++/src/test3.cc
===================================================================
--- /trunk/FACT++/src/test3.cc	(revision 10668)
+++ /trunk/FACT++/src/test3.cc	(revision 10669)
@@ -2,4 +2,6 @@
 #include <boost/filesystem.hpp>
 
+#include "FACT.h"
+#include "Dim.h"
 #include "Shell.h"
 #include "Configuration.h"
@@ -58,11 +60,5 @@
         "\n"
         "Usage: test3 [-c type] [OPTIONS]\n"
-        "  or:  test3 [OPTIONS]\n"
-        "\n"
-        "Options:\n"
-        "The following describes the available commandline options. "
-        "For further details on how command line option are parsed "
-        "and in which order which configuration sources are accessed "
-        "please refer to the class reference of the Configuration class.";
+        "  or:  test3 [OPTIONS]\n";
     cout << endl;
 
@@ -71,61 +67,6 @@
 void PrintHelp()
 {
-    cout <<
-        "The default is that the program is started without user intercation. "
-        "All actions are supposed to arrive as DimCommands. Using the -c "
-        "option, a local shell can be initialized. With h or help a short "
-        "help message about the usuage can be brought to the screen."
-        << endl;
-
-    /*
-     cout << "bla bla bla" << endl << endl;
-     cout << endl;
-     cout << "Environment:" << endl;
-     cout << "environment" << endl;
-     cout << endl;
-     cout << "Examples:" << endl;
-     cout << "test exam" << endl;
-     cout << endl;
-     cout << "Files:" << endl;
-     cout << "files" << endl;
-     cout << endl;
-     */
-}
-
-/*
- The first line of the --version information is assumed to be in one
- of the following formats:
-
-   <version>
-   <program> <version>
-   {GNU,Free} <program> <version>
-   <program> ({GNU,Free} <package>) <version>
-   <program> - {GNU,Free} <package> <version>
-
- and separated from any copyright/author details by a blank line.
-
- Handle multi-line bug reporting sections of the form:
-
-   Report <program> bugs to <addr>
-   GNU <package> home page: <url>
-   ...
-*/
-void PrintVersion(const char *name)
-{
-    string n = boost::filesystem::basename(name);
-    if (n.substr(0, 3)=="lt-")
-        n = n.substr(3);
-
-    cout <<
-        n << " - FACT++ 1.0\n"
-        "\n"
-        "Written by Thomas Bretz <thomas.bretz@epfl.ch> et al.\n"
-        "\n"
-        "Report bugs to Thomas Bretz <thomas.bretz@epfl.ch>\n"
-        "FACT++ home page: http://www.xxx.com\n"
-        "\n"
-        "Copyright (C) 2011 by the FACT Collaboration.\n"
-        "This is free software; see the source for copying conditions.\n"
-        << endl;
+    /* Additional help text which is printed after the configuration
+     options goes here */
 }
 
@@ -160,5 +101,5 @@
     if (conf.HasVersion())
     {
-        PrintVersion(argv[0]);
+        FACT::PrintVersion(argv[0]);
         return -1;
     }
@@ -170,6 +111,5 @@
     }
 
-    // To allow overwriting of DIM_DNS_NODE set 0 to 1
-    setenv("DIM_DNS_NODE", conf.Get<string>("dns").c_str(), 1);
+    Dim::Setup(conf.Get<string>("dns"));
 
     if (conf.Get<int>("console")==0)