Author: kpvdr Date: 2008-04-10 09:27:02 -0400 (Thu, 10 Apr 2008) New Revision: 1899 Modified: store/trunk/cpp/lib/BdbMessageStore.cpp store/trunk/cpp/lib/StorePlugin.cpp Log: Updated ambiguous help info and exception messages relating to store options Modified: store/trunk/cpp/lib/BdbMessageStore.cpp =================================================================== --- store/trunk/cpp/lib/BdbMessageStore.cpp 2008-04-09 20:31:55 UTC (rev 1898) +++ store/trunk/cpp/lib/BdbMessageStore.cpp 2008-04-10 13:27:02 UTC (rev 1899) @@ -1485,7 +1485,8 @@ { addOptions() ("store-directory", qpid::optValue(storeDir,"DIR"), - "Store directory location for persistence (overrides --data-dir)") + "Store directory location for persistence (instead of using --data-dir value). " + "Must be supplied if --no-data-dir is also used.") ("store-async", qpid::optValue(storeAsync,"yes|no"), "Use async persistence storage - if store supports it, enables AIO O_DIRECT.") ("store-force", qpid::optValue(storeForce,"yes|no"), Modified: store/trunk/cpp/lib/StorePlugin.cpp =================================================================== --- store/trunk/cpp/lib/StorePlugin.cpp 2008-04-09 20:31:55 UTC (rev 1898) +++ store/trunk/cpp/lib/StorePlugin.cpp 2008-04-10 13:27:02 UTC (rev 1899) @@ -49,15 +49,17 @@ if (options.storeDir.empty ()) { if (!dataDir.isEnabled ()) - throw Exception ("If --data-dir is blank, --store-directory must be set"); + throw Exception ("If --data-dir is blank or --no-data-dir is specified, " + "--store-directory must be present."); options.storeDir = dataDir.getPath (); } if (!store->init (&options)) { - throw Exception("Existing Journal in different mode, backup/move existing data " - "before changing modes. Or use '--store-force yes' to blow existing data away."); + throw Exception("Existing journal found in different bdb/async mode. " + "Move or delete existing data files before changing modes, or use " + "'--store-force yes' to discard existing data."); } broker->setStore (store);