summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-10-25 23:09:31 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-10-25 23:09:31 (GMT)
commiteb9abc67c78e61162040f8ad7d057fd96e0b0ba0 (patch)
tree477ba43899aa64c7ce429117ce1215a036544eb3
parent703aad3d888b9a84c8afeeb7fc5a3a0ad1184855 (diff)
downloadkolab-utils-eb9abc67c78e61162040f8ad7d057fd96e0b0ba0.tar.gz
A bit of cleanup
-rw-r--r--migrationutility/main.cpp5
-rw-r--r--migrationutility/tests/migrationscenariotest.cpp10
2 files changed, 1 insertions, 14 deletions
diff --git a/migrationutility/main.cpp b/migrationutility/main.cpp
index a8bf55f..73e6d4a 100644
--- a/migrationutility/main.cpp
+++ b/migrationutility/main.cpp
@@ -105,16 +105,13 @@ int main(int argc, char *argv[])
options.add("from-exchangeimap-encrypt <mode>", ki18n("Encryption mode to be used (NONE, TLS, SSL)"), "TLS");
options.add("from-exchangeimap-auth <mode>", ki18n("Authentication mode to be used (PLAIN, LOGIN, CRAMMD5, DIGESTMD5, NTLM, GSSAPI, ANONYMOUS, CLEARTEXT)"), "PLAIN");
- options.add("to <type>", ki18n("Target host type"));
+ options.add("to <type>", ki18n("Target host type (kolab3)"));
options.add("to-kolab3-host <host>", ki18n("Target Kolab3 host"));
options.add("to-kolab3-port <port>", ki18n("Port"), "143");
options.add("to-kolab3-user <loginname>", ki18n("Username for single-user migration"));
options.add("to-kolab3-proxyauth <loginname>", ki18n("Username to be used for authentication together with password (optional, works with PLAIN/SASL authentication)"));
options.add("to-kolab3-password <password>", ki18n("Password"));
-// options.add("e").add("encrypt <mode>", ki18n("Encryption mode to be used (NONE, TLS, SSL)"), "TLS");
-// options.add("a").add("auth <mode>", ki18n("Authentication mode to be used (PLAIN, LOGIN, CRAMMD5, DIGESTMD5, NTLM, GSSAPI, ANONYMOUS, CLEARTEXT)"), "PLAIN");
-// options.add("+[server/file]", ki18n("IMAP Server/File"));
KCmdLineArgs::addCmdLineOptions( options );
QCoreApplication app(argc, argv);
diff --git a/migrationutility/tests/migrationscenariotest.cpp b/migrationutility/tests/migrationscenariotest.cpp
index 0381e29..b5a20a8 100644
--- a/migrationutility/tests/migrationscenariotest.cpp
+++ b/migrationutility/tests/migrationscenariotest.cpp
@@ -84,16 +84,6 @@ public:
virtual ~MigrationScenarioTest(){};
private:
- KolabSourceServer *getSourceServer()
- {
- KolabSourceServer *kolabSourceServer = new KolabSourceServer(this);
- kolabSourceServer->setHost(sourcehost, port);
- kolabSourceServer->setAdminCredentials(admin, adminpw);
- kolabSourceServer->setSingleUser(user);
- return kolabSourceServer;
- }
-
-
void setupSourceAccount()
{
KolabServer *kolabServer = new KolabServer(this);