diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in
index adde7e488..65939cdf4 100644
--- a/livesupport/products/gLiveSupport/etc/Makefile.in
+++ b/livesupport/products/gLiveSupport/etc/Makefile.in
@@ -21,7 +21,7 @@
#
#
# Author : $Author: maroy $
-# Version : $Revision: 1.6 $
+# Version : $Revision: 1.7 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $
#
# @configure_input@
@@ -152,9 +152,10 @@ G_LIVESUPPORT_EXE_OBJS = ${TMP_DIR}/main.o
FSDF = ${G_LIVESUPPORT_OBJS} \
${TMP_DIR}/main.o
-G_LIVESUPPORT_EXE_LIBS = -l${CORE_LIB} \
- -l${AUTHENTICATION_LIB} \
+G_LIVESUPPORT_EXE_LIBS = -l${AUTHENTICATION_LIB} \
+ -l${STORAGE_LIB} \
-l${SCHEDULER_CLIENT_LIB} \
+ -l${CORE_LIB} \
-lboost_date_time-gcc \
-lxmlrpc++ -lssl -lxml++-1.0
diff --git a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml
index d01a3256f..9ea835e8b 100644
--- a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml
+++ b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml
@@ -3,6 +3,7 @@
@@ -18,6 +19,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -37,6 +69,15 @@
+
+
+
+
+
+
#include "LiveSupport/Authentication/AuthenticationClientFactory.h"
+#include "LiveSupport/Storage/StorageClientFactory.h"
#include "LiveSupport/SchedulerClient/SchedulerClientFactory.h"
#include "UiTestMainWindow.h"
@@ -46,6 +47,7 @@
using namespace LiveSupport::Core;
using namespace LiveSupport::Authentication;
+using namespace LiveSupport::Storage;
using namespace LiveSupport::SchedulerClient;
using namespace LiveSupport::GLiveSupport;
@@ -104,17 +106,27 @@ GLiveSupport :: configure(const xmlpp::Element & element)
authentication = acf->getAuthenticationClient();
+ // configure the StorageClientFactory
+ nodes = element.get_children(StorageClientFactory::getConfigElementName());
+ if (nodes.size() < 1) {
+ throw std::invalid_argument("no StorageClientFactory element");
+ }
+ Ptr::Ref stcf = StorageClientFactory::getInstance();
+ stcf->configure( *((const xmlpp::Element*) *(nodes.begin())) );
+
+ storage = stcf->getStorageClient();
+
// configure the SchedulerClientFactory
nodes = element.get_children(
SchedulerClientFactory::getConfigElementName());
if (nodes.size() < 1) {
throw std::invalid_argument("no schedulerClientFactory element");
}
- Ptr::Ref scf
+ Ptr::Ref schcf
= SchedulerClientFactory::getInstance();
- scf->configure( *((const xmlpp::Element*) *(nodes.begin())) );
+ schcf->configure( *((const xmlpp::Element*) *(nodes.begin())) );
- schedulerClient = scf->getSchedulerClient();
+ scheduler = schcf->getSchedulerClient();
}
diff --git a/livesupport/products/gLiveSupport/src/GLiveSupport.h b/livesupport/products/gLiveSupport/src/GLiveSupport.h
index f673c3e16..8ef1f0262 100644
--- a/livesupport/products/gLiveSupport/src/GLiveSupport.h
+++ b/livesupport/products/gLiveSupport/src/GLiveSupport.h
@@ -22,7 +22,7 @@
Author : $Author: maroy $
- Version : $Revision: 1.3 $
+ Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/GLiveSupport.h,v $
------------------------------------------------------------------------------*/
@@ -47,6 +47,7 @@
#include "LiveSupport/Core/Ptr.h"
#include "LiveSupport/Core/Configurable.h"
#include "LiveSupport/Core/AuthenticationClientInterface.h"
+#include "LiveSupport/Core/StorageClientInterface.h"
#include "LiveSupport/SchedulerClient/SchedulerClientInterface.h"
namespace LiveSupport {
@@ -73,18 +74,21 @@ using namespace LiveSupport::SchedulerClient;
*
*
*
*
* For a description of the resourceBundle,
- * authenticationClientFactory and
+ * authenticationClientFactory,
+ * storageClientFactory and
* schedulerClientFactory elements see their
* respective documentation.
*
* @author $Author: maroy $
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
* @see LocalizedObject#getBundle(const xmlpp::Element &)
* @see AuthenticationClientFactory
+ * @see StorageClientFactory
* @see SchedulerClientFactory
*/
class GLiveSupport : public Configurable,
@@ -106,10 +110,15 @@ class GLiveSupport : public Configurable,
*/
Ptr::Ref authentication;
+ /**
+ * The storage client used by the application.
+ */
+ Ptr::Ref storage;
+
/**
* The scheduler client, used to access the scheduler daemon.
*/
- Ptr::Ref schedulerClient;
+ Ptr::Ref scheduler;
/**
* The session id for the user.
diff --git a/livesupport/products/gLiveSupport/src/main.cxx b/livesupport/products/gLiveSupport/src/main.cxx
index 695d62847..21fe372db 100644
--- a/livesupport/products/gLiveSupport/src/main.cxx
+++ b/livesupport/products/gLiveSupport/src/main.cxx
@@ -22,7 +22,7 @@
Author : $Author: maroy $
- Version : $Revision: 1.4 $
+ Version : $Revision: 1.5 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/main.cxx,v $
------------------------------------------------------------------------------*/
@@ -151,7 +151,8 @@ int main ( int argc,
std::cerr << "using config file '" << configFileName << '\'' << std::endl;
- Ptr::Ref gLiveSupport(new GLiveSupport());
+ Ptr::Ref
+ gLiveSupport(new LiveSupport::GLiveSupport::GLiveSupport());
try {
std::auto_ptr