diff --git a/livesupport/modules/authentication/etc/Makefile.in b/livesupport/modules/authentication/etc/Makefile.in
index 325e00b7b..064befb6b 100644
--- a/livesupport/modules/authentication/etc/Makefile.in
+++ b/livesupport/modules/authentication/etc/Makefile.in
@@ -21,7 +21,7 @@
#
#
# Author : $Author: fgerlits $
-# Version : $Revision: 1.1 $
+# Version : $Revision: 1.2 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/etc/Makefile.in,v $
#
# @configure_input@
@@ -63,6 +63,8 @@ CORE_LIB_DIR = ${CORE_DIR}/lib
CORE_LIB = livesupport_core
CORE_LIB_FILE = ${CORE_LIB_DIR}/lib${CORE_LIB}.a
+STORAGE_SERVER_DIR = ${MODULES_DIR}/storageServer
+
VPATH = ${SRC_DIR}
TEST_RESULTS = ${DOC_DIR}/testResults.xml
@@ -131,6 +133,7 @@ distclean: clean docclean
${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te*
check: all ${TEST_RUNNER}
+ ${MAKE} -C ${STORAGE_SERVER_DIR}
LD_LIBRARY_PATH=${USR_LIB_DIR} ${TEST_RUNNER} \
-o ${TEST_RESULTS} -s ${TEST_XSLT}
diff --git a/livesupport/modules/authentication/include/LiveSupport/Authentication/AuthenticationClientFactory.h b/livesupport/modules/authentication/include/LiveSupport/Authentication/AuthenticationClientFactory.h
index 57635bbc9..c4d3a75a7 100644
--- a/livesupport/modules/authentication/include/LiveSupport/Authentication/AuthenticationClientFactory.h
+++ b/livesupport/modules/authentication/include/LiveSupport/Authentication/AuthenticationClientFactory.h
@@ -22,7 +22,7 @@
Author : $Author: fgerlits $
- Version : $Revision: 1.1 $
+ Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/include/LiveSupport/Authentication/AuthenticationClientFactory.h,v $
------------------------------------------------------------------------------*/
@@ -43,7 +43,7 @@
#include <stdexcept>
#include "LiveSupport/Core/Configurable.h"
-#include "LiveSupport/Authentication/AuthenticationClientInterface.h"
+#include "LiveSupport/Core/AuthenticationClientInterface.h"
namespace LiveSupport {
@@ -88,7 +88,7 @@ using namespace LiveSupport::Core;
* </code></pre>
*
* @author $Author: fgerlits $
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @see TestAuthenticationClient
*/
class AuthenticationClientFactory :
diff --git a/livesupport/modules/authentication/include/LiveSupport/Authentication/AuthenticationClientInterface.h b/livesupport/modules/authentication/include/LiveSupport/Authentication/AuthenticationClientInterface.h
deleted file mode 100644
index bbc18d125..000000000
--- a/livesupport/modules/authentication/include/LiveSupport/Authentication/AuthenticationClientInterface.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*------------------------------------------------------------------------------
-
- Copyright (c) 2004 Media Development Loan Fund
-
- This file is part of the LiveSupport project.
- http://livesupport.campware.org/
- To report bugs, send an e-mail to bugs@campware.org
-
- LiveSupport 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 of the License, or
- (at your option) any later version.
-
- LiveSupport 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 LiveSupport; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
- Author : $Author: fgerlits $
- Version : $Revision: 1.1 $
- Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/include/LiveSupport/Authentication/AuthenticationClientInterface.h,v $
-
-------------------------------------------------------------------------------*/
-#ifndef LiveSupport_Authentication_AuthenticationClientInterface_h
-#define LiveSupport_Authentication_AuthenticationClientInterface_h
-
-#ifndef __cplusplus
-#error This is a C++ include file
-#endif
-
-
-/* ============================================================ include files */
-
-#ifdef HAVE_CONFIG_H
-#include "configure.h"
-#endif
-
-#include <stdexcept>
-
-#include "LiveSupport/Core/Ptr.h"
-#include "LiveSupport/Authentication/SessionId.h"
-
-namespace LiveSupport {
-namespace Authentication {
-
-using namespace LiveSupport::Core;
-using namespace LiveSupport::Authentication;
-
-
-/* ================================================================ constants */
-
-
-/* =================================================================== macros */
-
-
-/* =============================================================== data types */
-
-/**
- * An interface for authentication clients.
- *
- * @author $Author: fgerlits $
- * @version $Revision: 1.1 $
- */
-class AuthenticationClientInterface
-{
- public:
- /**
- * Login to the authentication server.
- * Returns a new session ID; in case of an error, returns a
- * null pointer.
- *
- * @return the new session ID
- */
- virtual Ptr<SessionId>::Ref
- login(const std::string &login, const std::string &password)
- throw ()
- = 0;
-
- /**
- * Logout from the authentication server.
- *
- * @param sessionId the ID of the session to end
- * @return true if logged out successfully, false if not
- */
- virtual const bool
- logout(Ptr<SessionId>::Ref sessionId)
- throw ()
- = 0;
-};
-
-
-/* ================================================= external data structures */
-
-
-/* ====================================================== function prototypes */
-
-
-} // namespace Authentication
-} // namespace LiveSupport
-
-#endif // LiveSupport_Authentication_AuthenticationClientInterface_h
-
diff --git a/livesupport/modules/authentication/include/LiveSupport/Authentication/SessionId.h b/livesupport/modules/authentication/include/LiveSupport/Authentication/SessionId.h
deleted file mode 100644
index 4e08c03b4..000000000
--- a/livesupport/modules/authentication/include/LiveSupport/Authentication/SessionId.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*------------------------------------------------------------------------------
-
- Copyright (c) 2004 Media Development Loan Fund
-
- This file is part of the LiveSupport project.
- http://livesupport.campware.org/
- To report bugs, send an e-mail to bugs@campware.org
-
- LiveSupport 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 of the License, or
- (at your option) any later version.
-
- LiveSupport 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 LiveSupport; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
- Author : $Author: fgerlits $
- Version : $Revision: 1.1 $
- Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/include/LiveSupport/Authentication/Attic/SessionId.h,v $
-
-------------------------------------------------------------------------------*/
-#ifndef LiveSupport_Authentication_SessionId_h
-#define LiveSupport_Authentication_SessionId_h
-
-#ifndef __cplusplus
-#error This is a C++ include file
-#endif
-
-
-/* ============================================================ include files */
-
-#ifdef HAVE_CONFIG_H
-#include "configure.h"
-#endif
-
-namespace LiveSupport {
-namespace Authentication {
-
-/* ================================================================ constants */
-
-
-/* =================================================================== macros */
-
-
-/* =============================================================== data types */
-
-/**
- * A class representing session identifiers.
- *
- * @author $Author: fgerlits $
- * @version $Revision: 1.1 $
- */
-class SessionId
-{
- private:
- /**
- * The value of the session ID.
- */
- std::string id;
-
- /**
- * Default constructor.
- */
- SessionId(void) throw ()
- {
- }
-
-
- public:
- /**
- * The type for the numeric value the session id is represented in.
- */
- typedef std::string IdType;
-
- /**
- * Constructor to create a SessionId with a specific value.
- * TODO: remove this later, as this is for testing purposes only.
- *
- * @param id the value of the created id object.
- */
- SessionId(const IdType id) throw ()
- {
- this->id = id;
- }
-
- /**
- * Compare this is with an other one.
- *
- * @param otherId the other unqiue id to compare to.
- * @return true if this an otherId have the same ID value,
- * false otherwise.
- */
- bool
- operator==(const SessionId & otherId) const
- throw ()
- {
- return this->id == otherId.id;
- }
-
- /**
- * Compare this id with an other one.
- *
- * @param otherId the other session id to compare to.
- * @return true if this id is smaller than the other one,
- * false otherwise.
- */
- bool
- operator<(const SessionId & otherId) const
- throw ()
- {
- return this->id < otherId.id;
- }
-
- /**
- * Return the string value of this session ID.
- *
- * @return the string value of this id.
- */
- const IdType
- getId(void) const throw ()
- {
- return id;
- }
-};
-
-
-/* ================================================= external data structures */
-
-
-/* ====================================================== function prototypes */
-
-
-} // namespace Authentication
-} // namespace LiveSupport
-
-#endif // LiveSupport_Authentication_SessionId_h
-
diff --git a/livesupport/modules/authentication/include/LiveSupport/Authentication/WebAuthenticationClient.h b/livesupport/modules/authentication/include/LiveSupport/Authentication/WebAuthenticationClient.h
index 96676ca20..85c4e763a 100644
--- a/livesupport/modules/authentication/include/LiveSupport/Authentication/WebAuthenticationClient.h
+++ b/livesupport/modules/authentication/include/LiveSupport/Authentication/WebAuthenticationClient.h
@@ -22,7 +22,7 @@
Author : $Author: fgerlits $
- Version : $Revision: 1.1 $
+ Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/include/LiveSupport/Authentication/Attic/WebAuthenticationClient.h,v $
------------------------------------------------------------------------------*/
@@ -44,8 +44,8 @@
#include "LiveSupport/Core/Ptr.h"
#include "LiveSupport/Core/Configurable.h"
-#include "LiveSupport/Authentication/SessionId.h"
-#include "LiveSupport/Authentication/AuthenticationClientInterface.h"
+#include "LiveSupport/Core/SessionId.h"
+#include "LiveSupport/Core/AuthenticationClientInterface.h"
namespace LiveSupport {
@@ -53,7 +53,6 @@ namespace Authentication {
using namespace LiveSupport;
using namespace LiveSupport::Core;
-using namespace LiveSupport::Authentication;
/* ================================================================ constants */
@@ -67,7 +66,7 @@ using namespace LiveSupport::Authentication;
* An interface to the (possibly remote) php storage server.
*
* @author $Author: fgerlits $
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
class WebAuthenticationClient :
virtual public Configurable,
diff --git a/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx b/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx
index 17fc8768d..0a8724677 100644
--- a/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx
+++ b/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx
@@ -22,7 +22,7 @@
Author : $Author: fgerlits $
- Version : $Revision: 1.1 $
+ Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx,v $
------------------------------------------------------------------------------*/
@@ -44,8 +44,7 @@
#include <fstream>
#include <iostream>
-#include "LiveSupport/Authentication/SessionId.h"
-#include "LiveSupport/Authentication/WebAuthenticationClient.h"
+#include "LiveSupport/Core/SessionId.h"
#include "WebAuthenticationClientTest.h"
diff --git a/livesupport/modules/authentication/src/WebAuthenticationClientTest.h b/livesupport/modules/authentication/src/WebAuthenticationClientTest.h
index ea5a51d8c..22ac54fc3 100644
--- a/livesupport/modules/authentication/src/WebAuthenticationClientTest.h
+++ b/livesupport/modules/authentication/src/WebAuthenticationClientTest.h
@@ -22,7 +22,7 @@
Author : $Author: fgerlits $
- Version : $Revision: 1.1 $
+ Version : $Revision: 1.2 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/WebAuthenticationClientTest.h,v $
------------------------------------------------------------------------------*/
@@ -42,10 +42,13 @@
#include <cppunit/extensions/HelperMacros.h>
+#include "LiveSupport/Authentication/WebAuthenticationClient.h"
namespace LiveSupport {
namespace Authentication {
+using namespace LiveSupport::Core;
+
/* ================================================================ constants */
@@ -58,7 +61,7 @@ namespace Authentication {
* Unit test for the UploadPlaylistMetohd class.
*
* @author $Author: fgerlits $
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @see WebAuthenticationClient
*/
class WebAuthenticationClientTest : public CPPUNIT_NS::TestFixture