diff --git a/livesupport/modules/authentication/etc/webAuthentication.xml b/livesupport/modules/authentication/etc/webAuthentication.xml index 447d347ff..04fd95675 100644 --- a/livesupport/modules/authentication/etc/webAuthentication.xml +++ b/livesupport/modules/authentication/etc/webAuthentication.xml @@ -5,10 +5,10 @@ - + ]> - diff --git a/livesupport/modules/authentication/src/TestAuthenticationClient.cxx b/livesupport/modules/authentication/src/TestAuthenticationClient.cxx index 9a70a95cc..88ba4a39e 100644 --- a/livesupport/modules/authentication/src/TestAuthenticationClient.cxx +++ b/livesupport/modules/authentication/src/TestAuthenticationClient.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/TestAuthenticationClient.cxx,v $ ------------------------------------------------------------------------------*/ @@ -39,7 +39,6 @@ #error "Need unistd.h" #endif -#include // for testing only, REMOVE THIS later #include #include #include @@ -152,7 +151,7 @@ TestAuthenticationClient :: configure(const xmlpp::Element & element) /*------------------------------------------------------------------------------ - * Login to the storage server. + * Login to the authentication server. *----------------------------------------------------------------------------*/ Ptr::Ref TestAuthenticationClient :: login(const std::string & login, @@ -175,7 +174,7 @@ TestAuthenticationClient :: login(const std::string & login, /*------------------------------------------------------------------------------ - * Logout from the storage server. + * Logout from the authentication server. *----------------------------------------------------------------------------*/ const bool TestAuthenticationClient :: logout(Ptr::Ref sessionId) diff --git a/livesupport/modules/authentication/src/TestAuthenticationClient.h b/livesupport/modules/authentication/src/TestAuthenticationClient.h index c79c38526..5c5b9d73c 100644 --- a/livesupport/modules/authentication/src/TestAuthenticationClient.h +++ b/livesupport/modules/authentication/src/TestAuthenticationClient.h @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.3 $ + Version : $Revision: 1.4 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/TestAuthenticationClient.h,v $ ------------------------------------------------------------------------------*/ @@ -92,7 +92,7 @@ using namespace LiveSupport::Core; * * * @author $Author: fgerlits $ - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ */ class TestAuthenticationClient : virtual public Configurable, @@ -168,7 +168,7 @@ class TestAuthenticationClient : std::logic_error); /** - * Login to the storage server, using the data read from the + * Login to the authentication server, using the data read from the * configuration file. * Returns a new session ID; in case of an error, returns a * null pointer. @@ -180,7 +180,7 @@ class TestAuthenticationClient : throw (); /** - * Logout from the storage server. + * Logout from the authentication server. * * @param sessionId the ID of the session to end * @return true if logged out successfully, false if not diff --git a/livesupport/modules/authentication/src/TestAuthenticationClientTest.cxx b/livesupport/modules/authentication/src/TestAuthenticationClientTest.cxx index 146be13c9..31e1253fd 100644 --- a/livesupport/modules/authentication/src/TestAuthenticationClientTest.cxx +++ b/livesupport/modules/authentication/src/TestAuthenticationClientTest.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/TestAuthenticationClientTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -60,7 +60,7 @@ using namespace LiveSupport::Authentication; CPPUNIT_TEST_SUITE_REGISTRATION(TestAuthenticationClientTest); /** - * The name of the configuration file for the authentication client factory daemon. + * The name of the configuration file for the authentication client factory. */ static const std::string configFileName = "etc/testAuthentication.xml"; diff --git a/livesupport/modules/authentication/src/WebAuthenticationClient.cxx b/livesupport/modules/authentication/src/WebAuthenticationClient.cxx index 8b1d82c0f..0ca675a1e 100644 --- a/livesupport/modules/authentication/src/WebAuthenticationClient.cxx +++ b/livesupport/modules/authentication/src/WebAuthenticationClient.cxx @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.2 $ + Version : $Revision: 1.3 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/WebAuthenticationClient.cxx,v $ ------------------------------------------------------------------------------*/ @@ -39,7 +39,6 @@ #error "Need unistd.h" #endif -#include // for testing only, REMOVE THIS later #include #include #include @@ -87,7 +86,7 @@ static const std::string locationPortAttrName = "port"; static const std::string locationPathAttrName = "path"; -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: login */ +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ authentication server constants: login */ /*------------------------------------------------------------------------------ * The name of the login method on the storage server @@ -105,7 +104,7 @@ static const std::string loginParamName = "login"; static const std::string passwordParamName = "pass"; -/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ storage server constants: logout */ +/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ authentication server constants: logout */ /*------------------------------------------------------------------------------ * The name of the logout method on the storage server @@ -163,6 +162,7 @@ WebAuthenticationClient :: configure(const xmlpp::Element & element) if (!(attribute = locationConfigElement ->get_attribute(locationPortAttrName))) { +cerr << "\nmissing port #\n"; std::string eMsg = "Missing attribute "; eMsg += locationPortAttrName; throw std::invalid_argument(eMsg); @@ -189,7 +189,7 @@ WebAuthenticationClient :: configure(const xmlpp::Element & element) /*------------------------------------------------------------------------------ - * Login to the storage server. + * Login to the authentication server. *----------------------------------------------------------------------------*/ Ptr::Ref WebAuthenticationClient :: login(const std::string & login, @@ -220,7 +220,7 @@ WebAuthenticationClient :: login(const std::string & login, /*------------------------------------------------------------------------------ - * Logout from the storage server. + * Logout from the authentication server. *----------------------------------------------------------------------------*/ const bool WebAuthenticationClient :: logout(Ptr::Ref sessionId) diff --git a/livesupport/modules/authentication/include/LiveSupport/Authentication/WebAuthenticationClient.h b/livesupport/modules/authentication/src/WebAuthenticationClient.h similarity index 89% rename from livesupport/modules/authentication/include/LiveSupport/Authentication/WebAuthenticationClient.h rename to livesupport/modules/authentication/src/WebAuthenticationClient.h index eae9589d7..483d44a44 100644 --- a/livesupport/modules/authentication/include/LiveSupport/Authentication/WebAuthenticationClient.h +++ b/livesupport/modules/authentication/src/WebAuthenticationClient.h @@ -22,8 +22,8 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.5 $ - Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/include/LiveSupport/Authentication/Attic/WebAuthenticationClient.h,v $ + Version : $Revision: 1.1 $ + Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/WebAuthenticationClient.h,v $ ------------------------------------------------------------------------------*/ #ifndef WebAuthenticationClient_h @@ -63,7 +63,8 @@ using namespace LiveSupport::Core; /* =============================================================== data types */ /** - * An interface to the authentication methods on the php storage server. + * An interface to the authentication methods on the php authentication + * server (which is currently the same as the storage server). * * This object has to be configured with an XML configuration element * called webAuthentication. This element contains a child element @@ -92,7 +93,7 @@ using namespace LiveSupport::Core; * * * @author $Author: fgerlits $ - * @version $Revision: 1.5 $ + * @version $Revision: 1.1 $ */ class WebAuthenticationClient : virtual public Configurable, @@ -106,17 +107,19 @@ class WebAuthenticationClient : static const std::string configElementNameStr; /** - * The name of the storage server, e.g. "myserver.mycompany.com". + * The name of the authentication server, e.g. + * "myserver.mycompany.com". */ std::string storageServerName; /** - * The port wher the storage server is listening (default is 80). + * The port wher the authentication server is listening + * (default is 80). */ int storageServerPort; /** - * The path to the storage server php page. + * The path to the authentication server php page. */ std::string storageServerPath; @@ -157,7 +160,7 @@ class WebAuthenticationClient : std::logic_error); /** - * Login to the storage server, using the data read from the + * Login to the authentication server, using the data read from the * configuration file. * Returns a new session ID; in case of an error, returns a * null pointer. @@ -169,7 +172,7 @@ class WebAuthenticationClient : throw (); /** - * Logout from the storage server. + * Logout from the authentication server. * * @param sessionId the ID of the session to end * @return true if logged out successfully, false if not diff --git a/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx b/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx index c2f1339ad..628f1fb8d 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.3 $ + Version : $Revision: 1.4 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/src/WebAuthenticationClientTest.cxx,v $ ------------------------------------------------------------------------------*/ @@ -60,7 +60,7 @@ using namespace LiveSupport::Authentication; CPPUNIT_TEST_SUITE_REGISTRATION(WebAuthenticationClientTest); /** - * The name of the configuration file for the authentication client factory daemon. + * The name of the configuration file for the authentication client factory. */ static const std::string configFileName = "etc/webAuthentication.xml";