X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fhttp%2FxmlClient%2Fmain.cpp;h=ba2ad662f7c6466e52f985b22afbd04ad9e4040c;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=149d1a89a2298f994d617fc77fcd62a1f855bcd6;hpb=5256cb543a9d35b610df19bd227cde977186aef0;p=anna.git

diff --git a/example/http/xmlClient/main.cpp b/example/http/xmlClient/main.cpp
index 149d1a8..ba2ad66 100644
--- a/example/http/xmlClient/main.cpp
+++ b/example/http/xmlClient/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 //
 
 
 /**
@@ -72,9 +44,9 @@ class Sender : public anna::timex::Clock {
 public:
    Sender ();
    
-   void setMessageBySecond (const int messageBySecond) throw () { a_messageByTick = messageBySecond / (OneSecond / Period); }
+   void setMessageBySecond (const int messageBySecond) { a_messageByTick = messageBySecond / (OneSecond / Period); }
 
-   int getTxMessageCounter () const throw () { return a_txMessageCounter; }
+   int getTxMessageCounter () const { return a_txMessageCounter; }
 
 private:
    struct Attribute { enum _v { ValueOne, ValueTwo, Operator, Time, Max }; };
@@ -88,7 +60,7 @@ private:
    xml::Attribute* a_xmlAttributes [Attribute::Max];
 
    /* Se invoca 4 veces por segundo */
-   bool tick () throw (RuntimeException);
+   bool tick () noexcept(false);
 };
 
 class MyHandler : public http::Handler {
@@ -99,17 +71,17 @@ private:
    xml::DocumentMemory a_xmlRequest;
    xml::Parser a_xmlParser;
    
-   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);
    
-//   static bool isOk (const test::Response& response) throw ();
+//   static bool isOk (const test::Response& response) ;
 };
 
 class MyCommunicator : public Communicator {
 public:
    MyCommunicator () : Communicator (), a_avgResponseTime (0), a_rxMessageCounter (0) {;}
 
-   void count (const int delay) throw (RuntimeException);
+   void count (const int delay) noexcept(false);
 
 private:
    int a_avgResponseTime;
@@ -117,17 +89,17 @@ private:
    MyHandler a_httpHandler;
 
    
-   void eventReceiveMessage (ClientSocket&, const Message&) throw (RuntimeException);
+   void eventReceiveMessage (ClientSocket&, const Message&) noexcept(false);
 
-   void eventBreakConnection (const ClientSocket&) throw ();
+   void eventBreakConnection (const ClientSocket&) ;
 
    // Sustituye la redefinición de los siguientes métodos
    using comm::Communicator::eventBreakConnection;
 /*
-   void eventBreakConnection (Server* server) throw () {
+   void eventBreakConnection (Server* server) {
       comm::Communicator::eventBreakConnection (server);
    }
-   void eventBreakConnection (const Service* service) throw () { 
+   void eventBreakConnection (const Service* service) { 
       comm::Communicator::eventBreakConnection (service);
    }
 */      
@@ -137,8 +109,8 @@ class HeavyWIMS20Client : public anna::comm::Application {
 public:
    HeavyWIMS20Client ();
 
-   Server* getServer () const throw () { return a_server; }
-   const Sender* getSender () const throw () { return &a_sender; }
+   Server* getServer () const { return a_server; }
+   const Sender* getSender () const { return &a_sender; }
 
 private:
    MyCommunicator a_communicator;
@@ -146,8 +118,8 @@ private:
    Sender a_sender;
    Server* a_server;
 
-   void initialize () throw (RuntimeException);
-   void run () throw (RuntimeException);
+   void initialize () noexcept(false);
+   void run () noexcept(false);
 };
 
 using namespace std;
@@ -192,7 +164,7 @@ HeavyWIMS20Client::HeavyWIMS20Client () :
 }
 
 void HeavyWIMS20Client::initialize ()
-   throw (RuntimeException)
+   noexcept(false)
 {
    CommandLine& cl (CommandLine::instantiate ());
 
@@ -206,7 +178,7 @@ void HeavyWIMS20Client::initialize ()
 }
 
 void HeavyWIMS20Client::run ()
-   throw (RuntimeException)
+   noexcept(false)
 {
    a_timeController.activate (a_sender);
 
@@ -214,7 +186,7 @@ void HeavyWIMS20Client::run ()
 }
 
 void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Message& message)
-   throw (RuntimeException)
+   noexcept(false)
 {
    LOGMETHOD (TraceMethod tm ("MyCommunicator", "eventReceiveMessage", ANNA_FILE_LOCATION));
 
@@ -225,7 +197,7 @@ void MyCommunicator::eventReceiveMessage (ClientSocket& clientSocket, const Mess
 }
 
 void MyCommunicator::count (const int delay)
-   throw (RuntimeException)
+   noexcept(false)
 {
    Guard guard (this, "MyCommunicator::count");
    
@@ -234,7 +206,7 @@ void MyCommunicator::count (const int delay)
 }
 
 void MyCommunicator::eventBreakConnection (const ClientSocket& clientSocket)
-   throw ()
+   
 {
    if (a_rxMessageCounter == 0)
       return;
@@ -275,7 +247,7 @@ Sender::Sender () : Clock ("Sender", Period),
 }
 
 bool Sender::tick ()
-   throw (RuntimeException)
+   noexcept(false)
 {
    Server* server = static_cast <HeavyWIMS20Client&> (anna::app::functions::getApp ()).getServer ();
    Communicator* communicator = anna::app::functions::component <Communicator> (ANNA_FILE_LOCATION);
@@ -308,7 +280,7 @@ bool Sender::tick ()
 }
 
 void MyHandler::evResponse (ClientSocket& clientSocket, const http::Response& response)
-   throw (RuntimeException)
+   noexcept(false)
 {
    if (response.getStatusCode () != 200) 
       return;