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

diff --git a/example/http/server/main.cpp b/example/http/server/main.cpp
index c177788..c2849a0 100644
--- a/example/http/server/main.cpp
+++ b/example/http/server/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 //
 
 
 /*
@@ -75,8 +47,8 @@ private:
    test::Request a_testRequest;
    test::Response a_testResponse;
 
-   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 test::Communicator {
@@ -88,7 +60,7 @@ public:
 private:
    ThreadData <MyHandler> a_contexts;
    
-   void eventReceiveMessage (comm::ClientSocket&, const Message&) throw (RuntimeException);
+   void eventReceiveMessage (comm::ClientSocket&, const Message&) noexcept(false);
 };
 
 class HTTPArithmeticServer : public comm::Application {
@@ -99,9 +71,9 @@ private:
    MyCommunicator a_communicator;
    comm::ServerSocket* a_serverSocket;
 
-   void initialize () throw (RuntimeException);
-   void run () throw (RuntimeException);
-   xml::Node* asXML (xml::Node* app) const throw ();
+   void initialize () noexcept(false);
+   void run () noexcept(false);
+   xml::Node* asXML (xml::Node* app) const ;
 };
 
 using namespace std;
@@ -148,7 +120,7 @@ HTTPArithmeticServer::HTTPArithmeticServer () :
 }
 
 void HTTPArithmeticServer::initialize () 
-   throw (RuntimeException)
+   noexcept(false)
 {
    CommandLine& cl (CommandLine::instantiate ());
 
@@ -159,7 +131,7 @@ void HTTPArithmeticServer::initialize ()
 }
 
 void HTTPArithmeticServer::run ()
-   throw (RuntimeException)
+   noexcept(false)
 {
    CommandLine& cl (CommandLine::instantiate ());
 
@@ -181,7 +153,7 @@ void HTTPArithmeticServer::run ()
 }
 
 xml::Node* HTTPArithmeticServer::asXML (xml::Node* app) const 
-   throw ()
+   
 {
    xml::Node* node = app::Application::asXML (app);
    
@@ -192,7 +164,7 @@ xml::Node* HTTPArithmeticServer::asXML (xml::Node* app) const
 }
 
 void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Message& message)
-   throw (RuntimeException)
+   noexcept(false)
 {
    LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventReceiveMessage", ANNA_FILE_LOCATION));
 
@@ -210,7 +182,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 ();