X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fhttp%2Fwims20Client%2Fmain.cpp;h=36522ef51bd373a7fd4ff839eeb32fa06647faf5;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=2294777b047459accda3062954b80d9c045583d7;hpb=5256cb543a9d35b610df19bd227cde977186aef0;p=anna.git

diff --git a/example/http/wims20Client/main.cpp b/example/http/wims20Client/main.cpp
index 2294777..36522ef 100644
--- a/example/http/wims20Client/main.cpp
+++ b/example/http/wims20Client/main.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     *  Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 /*
@@ -63,8 +35,8 @@ public:
 private:
    http::Response a_httpResponse;
 
-   void evRequest (ClientSocket&, const http::Request&) throw (RuntimeException) {;}
-   void evResponse (ClientSocket&, const http::Response&) throw (RuntimeException);
+   void evRequest (ClientSocket&, const http::Request&) noexcept(false) {;}
+   void evResponse (ClientSocket&, const http::Response&) noexcept(false);
 };
 
 class MyCommunicator : public Communicator {
@@ -79,22 +51,22 @@ private:
    MyHandler a_httpHandler;
    http::Request a_httpRequest;
 
-   void eventReceiveMessage (ClientSocket &, const Message&) throw (RuntimeException);
-   void eventStartup () throw (RuntimeException);
+   void eventReceiveMessage (ClientSocket &, const Message&) noexcept(false);
+   void eventStartup () noexcept(false);
 };
 
 class IHTTPClient : public anna::comm::Application {
 public:
    IHTTPClient ();
 
-   Server* getServer () const throw () { return a_server; }
+   Server* getServer () const { return a_server; }
 
 private:
    MyCommunicator a_communicator;
    Server* a_server;
 
-   void initialize () throw (RuntimeException);
-   void run () throw (RuntimeException);
+   void initialize () noexcept(false);
+   void run () noexcept(false);
 };
 
 using namespace std;
@@ -140,7 +112,7 @@ IHTTPClient::IHTTPClient () :
 }
 
 void IHTTPClient::initialize () 
-   throw (RuntimeException)
+   noexcept(false)
 {
    CommandLine& cl (CommandLine::instantiate ());
 
@@ -155,13 +127,13 @@ void IHTTPClient::initialize ()
 }
 
 void IHTTPClient::run ()
-   throw (RuntimeException)
+   noexcept(false)
 {
    a_communicator.accept ();
 }
 
 void MyCommunicator::eventStartup ()
-   throw (RuntimeException)
+   noexcept(false)
 {
    CommandLine& cl (CommandLine::instantiate ());
 
@@ -196,7 +168,7 @@ void MyCommunicator::eventStartup ()
 }
 
 void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Message& message)
-   throw (RuntimeException)
+   noexcept(false)
 {
    LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventReceiveMessage", ANNA_FILE_LOCATION));
 
@@ -207,7 +179,7 @@ void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Mess
 }
 
 void MyHandler::evResponse (ClientSocket& clientSocket, const http::Response& response)
-   throw (RuntimeException)
+   noexcept(false)
 {
    cout << "HTTP StatusCode: " << response.getStatusCode () << endl;
    cout << "HTTP Text: " << response.getReasonPhrase () << endl;