X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fhttp%2Fecho%2Fmain.cpp;h=0ceea9f733266cd2fe271e450283e6dd7e28dd1c;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=177e0036cd4347cdb1ddb01efb086dd512903583;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/example/http/echo/main.cpp b/example/http/echo/main.cpp
index 177e003..0ceea9f 100644
--- a/example/http/echo/main.cpp
+++ b/example/http/echo/main.cpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// 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 Google Inc. 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 //
 
 
 #include <iostream>
@@ -58,27 +30,27 @@ public:
       a_httpResponse.createHeader (http::Header::Type::Server)->setValue (anna_use_sccs_tag (http));
    }
 
-   void setNotSend (const bool notSend) throw () { a_notSend = notSend; }
+   void setNotSend (const bool notSend) { a_notSend = notSend; }
 
 private:
    http::Response a_httpResponse;
    bool a_notSend;
 
-   void evRequest (ClientSocket&, const http::Request& request) throw (RuntimeException);
-   void evResponse (ClientSocket&, const http::Response&) throw (RuntimeException) {;}
+   void evRequest (ClientSocket&, const http::Request& request) noexcept(false);
+   void evResponse (ClientSocket&, const http::Response&) noexcept(false) {;}
 };
 
 class MyCommunicator : public comm::Communicator {
 public:
    MyCommunicator () {;}
 
-   void setNotSend (const bool notSend) throw () { a_httpHandler.setNotSend (notSend); }
+   void setNotSend (const bool notSend) { a_httpHandler.setNotSend (notSend); }
 
 private:
    MyHandler a_httpHandler;
 
    void eventReceiveMessage (comm::ClientSocket &, const Message& message)
-      throw (RuntimeException);
+      noexcept(false);
 };
 
 class HTTPArithmeticServer : public comm::Application {
@@ -89,8 +61,8 @@ private:
    MyCommunicator a_communicator;
    comm::ServerSocket* a_serverSocket;
 
-   void initialize () throw (RuntimeException);
-   void run () throw (RuntimeException);
+   void initialize () noexcept(false);
+   void run () noexcept(false);
 };
 
 using namespace std;
@@ -133,7 +105,7 @@ HTTPArithmeticServer::HTTPArithmeticServer () :
 }
 
 void HTTPArithmeticServer::initialize () 
-   throw (RuntimeException)
+   noexcept(false)
 {
    CommandLine& cl (CommandLine::instantiate ());
 
@@ -146,14 +118,14 @@ void HTTPArithmeticServer::initialize ()
 }
 
 void HTTPArithmeticServer::run ()
-   throw (RuntimeException)
+   noexcept(false)
 {
    a_communicator.attach (a_serverSocket);
    a_communicator.accept ();
 }
 
 void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Message& message)
-   throw (RuntimeException)
+   noexcept(false)
 {
    LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventReceiveMessage", ANNA_FILE_LOCATION));
 
@@ -163,8 +135,6 @@ void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Mess
    static int messageCounter = 0;
    static int successCounter = 0;
 
-   int value;
-
    CongestionController& congestionController = CongestionController::instantiate ();
 
    messageCounter ++;
@@ -178,7 +148,7 @@ void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Mess
 }
 
 void MyHandler::evRequest (ClientSocket& clientSocket, const http::Request& request)
-   throw (RuntimeException)
+   noexcept(false)
 {
    const DataBlock& body = request.getBody ();