[asterisk-scf-commits] asterisk-scf/integration/logger.git branch "c++0x" created.

[Commits to the Asterisk SCF project code repositories]

branch "c++0x" has been created
        at  abd047239394a679d8c87d3c3f149cf0076ad3a0 (commit)

- Log -----------------------------------------------------------------
commit abd047239394a679d8c87d3c3f149cf0076ad3a0
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Nov 29 18:53:42 2010 -0400

    Make the logger happy when compiling under C++0x by utilizing std::shared_ptr.
    
    Note: This does not enforce C++0x as a requirement. std::auto_ptr will get used
    when C++0x support is not enabled.

diff --git a/client/src/LoggerFactory.cpp b/client/src/LoggerFactory.cpp
index eb3eaec..7d80b3b 100644
--- a/client/src/LoggerFactory.cpp
+++ b/client/src/LoggerFactory.cpp
@@ -37,7 +37,11 @@ LoggerFactory *loggerFactory = 0;
 
 void initLoggerFactory()
 {
+#ifdef CPP_ZEROX_SUPPORT
+    static std::shared_ptr<LogOut> out = buildOstreamLogger(std::cout);
+#else
     static std::auto_ptr<LogOut> out = buildOstreamLogger(std::cout);
+#endif
     static LoggerFactory singleton(*out);
     loggerFactory = &singleton;
 }
diff --git a/client/src/OstreamLogger.cpp b/client/src/OstreamLogger.cpp
index f108629..56b526e 100644
--- a/client/src/OstreamLogger.cpp
+++ b/client/src/OstreamLogger.cpp
@@ -42,7 +42,14 @@ private:
 
 }
 
+#ifdef CPP_ZEROX_SUPPORT
+std::shared_ptr<LogOut> AsteriskSCF::System::Logging::buildOstreamLogger(std::ostream &out)
+{
+    return std::shared_ptr<LogOut>(new OstreamLogger(out));
+}
+#else
 std::auto_ptr<LogOut> AsteriskSCF::System::Logging::buildOstreamLogger(std::ostream &out)
 {
     return std::auto_ptr<LogOut>(new OstreamLogger(out));
 }
+#endif
diff --git a/client/src/logger.h b/client/src/logger.h
index 337d589..60adbee 100644
--- a/client/src/logger.h
+++ b/client/src/logger.h
@@ -292,7 +292,11 @@ private:
     static void accumulateLoggerNames(Logger const &logger, std::vector<std::string> &out);
 };
 
+#ifdef CPP_ZEROX_SUPPORT
+ASTERISK_SCF_ICEBOX_EXPORT std::shared_ptr<LogOut> buildOstreamLogger(std::ostream &out);
+#else
 ASTERISK_SCF_ICEBOX_EXPORT std::auto_ptr<LogOut> buildOstreamLogger(std::ostream &out);
+#endif
 
 /**
  * Returns the default configured LoggerFactory.
diff --git a/client/test/LoggerFactory-test.cpp b/client/test/LoggerFactory-test.cpp
index ceeb2dd..648c323 100644
--- a/client/test/LoggerFactory-test.cpp
+++ b/client/test/LoggerFactory-test.cpp
@@ -26,7 +26,11 @@ BOOST_AUTO_TEST_SUITE(LoggerFactoryTest)
 BOOST_AUTO_TEST_CASE(testGetDistinct)
 {
     std::stringstream tmp;
+#ifdef CPP_ZEROX_SUPPORT
+    std::shared_ptr<LogOut> logOut = buildOstreamLogger(tmp);
+#else
     std::auto_ptr<LogOut> logOut = buildOstreamLogger(tmp);
+#endif
     LoggerFactory uut(*logOut);
 
     Logger const &asteriskScf = uut.getLogger("AsteriskSCF");
@@ -40,7 +44,11 @@ BOOST_AUTO_TEST_CASE(testGetDistinct)
 BOOST_AUTO_TEST_CASE(testInheritence_off)
 {
     std::stringstream actual;
+#ifdef CPP_ZEROX_SUPPORT
+    std::shared_ptr<LogOut> logOut = buildOstreamLogger(actual);
+#else
     std::auto_ptr<LogOut> logOut = buildOstreamLogger(actual);
+#endif
     LoggerFactory uut(*logOut);
 
     Logger &root = uut.getLogger("");
@@ -55,7 +63,11 @@ BOOST_AUTO_TEST_CASE(testInheritence_off)
 BOOST_AUTO_TEST_CASE(testInheritence_on)
 {
     std::stringstream actual;
+#ifdef CPP_ZEROX_SUPPORT
+    std::shared_ptr<LogOut> logOut = buildOstreamLogger(actual);
+#else
     std::auto_ptr<LogOut> logOut = buildOstreamLogger(actual);
+#endif
     LoggerFactory uut(*logOut);
 
     Logger &root = uut.getLogger("");
diff --git a/server/src/ChainedLogOut.h b/server/src/ChainedLogOut.h
index 818c4c8..34958e9 100644
--- a/server/src/ChainedLogOut.h
+++ b/server/src/ChainedLogOut.h
@@ -35,7 +35,11 @@ public:
     ChainedLogOut()
     {
     }
+#ifdef CPP_ZEROX_SUPPORT
+    ChainedLogOut(std::shared_ptr<ChainedLogOut> next) :
+#else
     ChainedLogOut(std::auto_ptr<ChainedLogOut> next) :
+#endif
         mNext(next)
     {
     }
@@ -66,7 +70,11 @@ protected:
     virtual void myLogs(std::string const &name, Level logLevel,
         std::string const &message) = 0;
 
+#ifdef CPP_ZEROX_SUPPORT
+    std::shared_ptr<ChainedLogOut> mNext;
+#else
     std::auto_ptr<ChainedLogOut> mNext;
+#endif
 };
 
 } // Logging
diff --git a/server/src/FileChainedLogOut.h b/server/src/FileChainedLogOut.h
index d84f2eb..17a2a8d 100644
--- a/server/src/FileChainedLogOut.h
+++ b/server/src/FileChainedLogOut.h
@@ -36,7 +36,11 @@ public:
         ChainedLogOut(), mLogFile(logFile)
     {
     }
+#ifdef CPP_ZEROX_SUPPORT
+    FileChainedLogOut(std::string const &logFile, std::shared_ptr<ChainedLogOut> next) :
+#else
     FileChainedLogOut(std::string const &logFile, std::auto_ptr<ChainedLogOut> next) :
+#endif
         ChainedLogOut(next), mLogFile(logFile)
     {
     }
diff --git a/server/src/LoggingServer.cpp b/server/src/LoggingServer.cpp
index 517a1e2..7db001d 100644
--- a/server/src/LoggingServer.cpp
+++ b/server/src/LoggingServer.cpp
@@ -139,9 +139,15 @@ bool LoggingServerI::isSubpathOf(std::string const &path,
 
 // <prefix>.logger=level
 // <prefix>.logger.<name>=level
+#ifdef CPP_ZEROX_SUPPORT
+void LoggingServerI::configure(std::shared_ptr<ChainedLogOut> out,
+    ServerConfigurationListenerPrx configurationListener,
+    Ice::PropertiesPtr props)
+#else
 void LoggingServerI::configure(std::auto_ptr<ChainedLogOut> out,
     ServerConfigurationListenerPrx configurationListener,
     Ice::PropertiesPtr props)
+#endif
 {
     this->mOut = out;
     this->mConfigurationListener = configurationListener;
diff --git a/server/src/LoggingServer.h b/server/src/LoggingServer.h
index 2feec18..3607f23 100644
--- a/server/src/LoggingServer.h
+++ b/server/src/LoggingServer.h
@@ -76,7 +76,11 @@ public:
     ASTERISK_SCF_ICEBOX_EXPORT Level getEffectiveLevel(std::string const &name) const;
     ASTERISK_SCF_ICEBOX_EXPORT void setLevel(std::string const &name, Level level);
 
+#ifdef CPP_ZEROX_SUPPORT
+    ASTERISK_SCF_ICEBOX_EXPORT void configure(std::shared_ptr<ChainedLogOut> out, ServerConfigurationListenerPrx configurationListener, Ice::PropertiesPtr props);
+#else
     ASTERISK_SCF_ICEBOX_EXPORT void configure(std::auto_ptr<ChainedLogOut> out, ServerConfigurationListenerPrx configurationListener, Ice::PropertiesPtr props);
+#endif
 
     static const std::string LoggingPropertyPrefix;
 
@@ -99,7 +103,11 @@ private:
 
     ServerConfigurationListenerPrx mConfigurationListener;
 
+#ifdef CPP_ZEROX_SUPPORT
+    std::shared_ptr<ChainedLogOut> mOut;
+#else
     std::auto_ptr<ChainedLogOut> mOut;
+#endif
 };
 
 } // Logging
diff --git a/server/src/OstreamChainedLogOut.h b/server/src/OstreamChainedLogOut.h
index 22c3a49..cf3f8e8 100644
--- a/server/src/OstreamChainedLogOut.h
+++ b/server/src/OstreamChainedLogOut.h
@@ -36,7 +36,11 @@ public:
         ChainedLogOut(), mOut(out)
     {
     }
+#ifdef CPP_ZEROX_SUPPORT
+    OstreamChainedLogOut(std::ostream &out, std::shared_ptr<ChainedLogOut> next) :
+#else
     OstreamChainedLogOut(std::ostream &out, std::auto_ptr<ChainedLogOut> next) :
+#endif
         ChainedLogOut(next), mOut(out)
     {
     }
diff --git a/server/src/main.cpp b/server/src/main.cpp
index 3a68d37..3cc922c 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -149,7 +149,11 @@ void LoggingService::start(std::string const &name,
         std::clog << e.what() << '\n';
     }
 
+#ifdef CPP_ZEROX_SUPPORT
+    std::shared_ptr<ChainedLogOut> logOut(new FileChainedLogOut(LogFileName));
+#else
     std::auto_ptr<ChainedLogOut> logOut(new FileChainedLogOut(LogFileName));
+#endif
     if (std::cout)
     {
         // only append stdout if cout is open.

commit 31e92c0ef55b8400b3e249274e08a0212b2ba997
Author: David M. Lee <dlee at digium.com>
Date:   Wed Nov 24 16:47:05 2010 -0600

    Use AMI to invoke locator.locate().
    
    When used as the client for the ServiceLocator itself, the call to
    locator.locate() deadlocks.  This happens because the communication
    thread is locked servicing the incoming IceStorm message, and cannot
    be acquired to send to the locator.  This would work if the locator
    we colocated, but AMD prevents that.

diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index 6df347c..1056237 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -72,29 +72,39 @@ void ConfiguredIceLogger::updateLoggerFromServiceLocator()
 {
     if (mLocator)
     {
-        try
-        {
-            ServiceLocatorParamsPtr loggingServerParams =
-                new ServiceLocatorParams();
-            Ice::ObjectPrx serverObject = mLocator->locate(loggingServerParams);
-            if (serverObject)
-            {
-                LoggingServerPrx server = LoggingServerPrx::checkedCast(
-                    serverObject);
-                mLogger.setServer(server);
-            }
-        }
-        catch (Core::Discovery::V1::ServiceNotFound const &)
-        {
-            // couldn't find the service;
-            mLogger.setServer(LoggingServerPrx());
-        }
-        catch (std::exception const &e)
+        // we must use AMI to free this thread up for servicing requests
+        // if this client is used by the service locator itself, a
+        // synchronous call to locate would result in a deadlock
+        ServiceLocatorParamsPtr loggingServerParams =
+            new ServiceLocatorParams(LoggingServerCategory);
+        mLocator->begin_locate(loggingServerParams);
+    }
+}
+
+void ConfiguredIceLogger::locateFinished(const Ice::AsyncResultPtr &r)
+{
+    ServiceLocatorPrx locator = ServiceLocatorPrx::uncheckedCast(r->getProxy());
+    try
+    {
+        Ice::ObjectPrx serverObject = locator->end_locate(r);
+        if (serverObject)
         {
-            std::clog << "Failed to locate LoggerService: " << e.what() << '\n';
-            mLogger.setServer(LoggingServerPrx());
+            LoggingServerPrx server = LoggingServerPrx::checkedCast(
+                serverObject);
+            mLogger.setServer(server);
         }
     }
+    catch (Core::Discovery::V1::ServiceNotFound const &)
+    {
+        // couldn't find the service;
+        mLogger.setServer(LoggingServerPrx());
+    }
+    catch (std::exception const &e)
+    {
+        std::clog << "(Logger) Failed to locate LoggerService: " <<
+            e.what() << '\n';
+        mLogger.setServer(LoggingServerPrx());
+    }
 }
 
 void ConfiguredIceLogger::comparisonRegistered(std::string const &guid,
diff --git a/client/src/IceLogger.h b/client/src/IceLogger.h
index d8abf04..fc04983 100644
--- a/client/src/IceLogger.h
+++ b/client/src/IceLogger.h
@@ -74,6 +74,8 @@ public:
 private:
     IceLogger mLogger;
     Core::Discovery::V1::ServiceLocatorPrx mLocator;
+
+    void locateFinished(const Ice::AsyncResultPtr &r);
 };
 
 typedef IceUtil::Handle<ConfiguredIceLogger> ConfiguredIceLoggerPtr;

commit e17f9ff765950f0aade918c391dda9aa04cf98fa
Author: David M. Lee <dlee at digium.com>
Date:   Wed Nov 24 16:46:39 2010 -0600

    Prefix local messages with (Logger).

diff --git a/client/src/IceConfigurator.cpp b/client/src/IceConfigurator.cpp
index e7e5f60..53ad662 100644
--- a/client/src/IceConfigurator.cpp
+++ b/client/src/IceConfigurator.cpp
@@ -121,12 +121,17 @@ IceConfiguratorPtr AsteriskSCF::System::Logging::createIceConfigurator(
             adapter->activate();
             return r;
         }
+        else
+        {
+            std::clog << "(Logger) "
+                "IceStorm not available.  Cannot listen to config events.\n";
+        }
     }
     catch (std::exception const &e)
     {
-        std::clog << "Error registering with IceStorm: " << e.what() << '\n';
+        std::clog << "(Logger) Error registering with IceStorm: " <<
+            e.what() << '\n';
     }
 
-    std::clog << "IceStorm not available.  Cannot listen to config events.\n";
     return IceConfiguratorPtr();
 }
diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index 1288d2e..6df347c 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -38,11 +38,12 @@ void IceLogger::logs(std::string const &name, Level logLevel,
     }
     catch (std::exception const &e)
     {
-        std::clog << "Failed to contact LoggerServer: " << e.what() << '\n';
+        std::clog << "(Logger) Failed to contact LoggerServer: " <<
+            e.what() << '\n';
     }
     catch (...)
     {
-        std::clog << "Failed to contact LoggerServer\n";
+        std::clog << "(Logger) Failed to contact LoggerServer\n";
     }
 
     if (!logged)
@@ -157,7 +158,8 @@ ConfiguredIceLoggerPtr AsteriskSCF::System::Logging::createIceLogger(
     }
     catch (std::exception const &e)
     {
-        std::clog << "Failed to contact LoggerServer: " << e.what() << '\n';
+        std::clog << "(Logger) Failed to contact LoggerServer: " <<
+            e.what() << '\n';
     }
 
     // ServiceLocator used AMD, which won't work with collocation optimization
@@ -169,7 +171,7 @@ ConfiguredIceLoggerPtr AsteriskSCF::System::Logging::createIceLogger(
     // log to a LoggerServer because it can never find it.
     if (!locator)
     {
-        std::clog << "LocatorService.Proxy not set.  Cannot find "
+        std::clog << "(Logger) LocatorService.Proxy not set.  Cannot find "
                   << LoggingServerGuid << '\n';
     }
 
@@ -193,13 +195,14 @@ ConfiguredIceLoggerPtr AsteriskSCF::System::Logging::createIceLogger(
         }
         catch (std::exception const &e)
         {
-            std::clog << "Failed to subscribe to " << Discovery::TOPIC << ": "
-                      << e.what() << '\n';
+            std::clog << "(Logger) Failed to subscribe to " <<
+                Discovery::TOPIC << ": " << e.what() << '\n';
         }
     }
     else
     {
-        std::clog << "TopicManager.Proxy not set.  Will not receive updates.\n";
+        std::clog << "(Logger) TopicManager.Proxy not set.  "
+            "Will not receive updates.\n";
     }
 
     return logger;

commit 62a90a5e6bad3c7f5006aeb3a0ce31d637daef62
Author: David M. Lee <dlee at digium.com>
Date:   Wed Nov 24 16:06:25 2010 -0600

    Improved no server message.

diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index 2ebab57..1288d2e 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -42,13 +42,17 @@ void IceLogger::logs(std::string const &name, Level logLevel,
     }
     catch (...)
     {
-        std::clog << "Failed to contact LoggerServer";
+        std::clog << "Failed to contact LoggerServer\n";
     }
 
     if (!logged)
     {
-        std::clog << "(no server) " << name << ":" << logLevel << ":" << message
-                  << '\n';
+        if (!hasPrintedNoServerNotice) {
+            hasPrintedNoServerNotice = true;
+            std::clog <<
+                "!!! unable to log to server.  logging to stderr instead.\n";
+        }
+        std::clog << name << ":" << logLevel << ":" << message << '\n';
     }
 }
 
diff --git a/client/src/IceLogger.h b/client/src/IceLogger.h
index 49ea64e..d8abf04 100644
--- a/client/src/IceLogger.h
+++ b/client/src/IceLogger.h
@@ -27,6 +27,8 @@ namespace Logging
 class IceLogger : public LogOut
 {
 public:
+    IceLogger() : hasPrintedNoServerNotice(false) {}
+
     void logs(std::string const &name, Level logLevel,
         std::string const &message);
 
@@ -35,6 +37,7 @@ public:
 
 private:
     LoggingServerPrx mServer;
+    bool hasPrintedNoServerNotice;
 };
 
 /**

commit a18787010c89a930bb29c6ced843561efdafac62
Author: David M. Lee <dlee at digium.com>
Date:   Wed Nov 24 16:05:51 2010 -0600

    Disable collocation optimization for service locator proxy.

diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index 84ff57f..2ebab57 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -156,8 +156,10 @@ ConfiguredIceLoggerPtr AsteriskSCF::System::Logging::createIceLogger(
         std::clog << "Failed to contact LoggerServer: " << e.what() << '\n';
     }
 
+    // ServiceLocator used AMD, which won't work with collocation optimization
     ServiceLocatorPrx locator = ServiceLocatorPrx::uncheckedCast(
-        communicator->propertyToProxy("LocatorService.Proxy"));
+        communicator->propertyToProxy("LocatorService.Proxy")
+            ->ice_collocationOptimized(false));
     // if the LocatorService.Proxy isn't set, we'll log a message, but proceed
     // on in ignorance.  we'll basically build an IceLogger that can never
     // log to a LoggerServer because it can never find it.

commit 654e65ef2f217a127cbab5995e879fa44b83f8b5
Author: David M. Lee <dlee at digium.com>
Date:   Wed Nov 24 16:07:48 2010 -0600

    Stupid execute bit.

diff --git a/client/src/LogOut.h b/client/src/LogOut.h
old mode 100755
new mode 100644
diff --git a/client/src/logger.h b/client/src/logger.h
old mode 100755
new mode 100644
diff --git a/common/Level.h b/common/Level.h
old mode 100755
new mode 100644
diff --git a/server/config/logging-server.conf b/server/config/logging-server.conf
old mode 100755
new mode 100644
diff --git a/server/src/CMakeLists.txt b/server/src/CMakeLists.txt
old mode 100755
new mode 100644
diff --git a/server/src/main.cpp b/server/src/main.cpp
old mode 100755
new mode 100644
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
old mode 100755
new mode 100644

commit c5add8e128b28e4d3102383fb603fec6c0300b96
Author: David M. Lee <dlee at digium.com>
Date:   Tue Nov 16 22:47:07 2010 -0600

    Hydra -> AsteriskSCF

diff --git a/client/config/logging-client.conf b/client/config/logging-client.conf
index 0ae8e15..f940860 100644
--- a/client/config/logging-client.conf
+++ b/client/config/logging-client.conf
@@ -9,4 +9,4 @@ AsteriskSCF.LoggingClient.Endpoints=default
 LocatorService.Proxy=LocatorService:tcp -p 4411
 
 # A proxy to the IceStorm topic manager
-TopicManager.Proxy=HydraIceStorm/TopicManager:default -p 10000
+TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000

commit b640beafa142b1becd1e2d305748199de88ce6dc
Author: David M. Lee <dlee at digium.com>
Date:   Mon Nov 15 10:59:32 2010 -0600

    Stray space.

diff --git a/server/src/LoggingServer.h b/server/src/LoggingServer.h
index 94b75b1..2feec18 100644
--- a/server/src/LoggingServer.h
+++ b/server/src/LoggingServer.h
@@ -64,7 +64,7 @@ class LoggingServerI : public LoggingServer
 public:
     ASTERISK_SCF_ICEBOX_EXPORT LoggingServerI();
 
-    ASTERISK_SCF_ICEBOX_EXPORT void logs(std::string const &, Level, 
+    ASTERISK_SCF_ICEBOX_EXPORT void logs(std::string const &, Level,
         const std::string&, const Ice::Current&) const;
     Configuration getConfiguration(Ice::Current const &) const
     {

commit a044bc5c787b6ee1b5a4581a2c9bab8cbacbc2b9
Author: David M. Lee <dlee at digium.com>
Date:   Tue Nov 9 00:04:41 2010 -0600

    Fixed logger test failures on Mac.
    
    I was mixing the use of linking in boost_unit_test_framework and the
    single header variant, which caused all sorts of grief.

diff --git a/client/test/client-test.cpp b/client/test/client-test.cpp
index 4b29507..611848a 100644
--- a/client/test/client-test.cpp
+++ b/client/test/client-test.cpp
@@ -14,5 +14,6 @@
  * at the top of the source tree.
  */
 
+#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE Logger-client
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
diff --git a/server/test/server-test.cpp b/server/test/server-test.cpp
index 3dbaff9..cc7b3bc 100644
--- a/server/test/server-test.cpp
+++ b/server/test/server-test.cpp
@@ -14,5 +14,6 @@
  * at the top of the source tree.
  */
 
+#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE Logger-server
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>

commit 8ffbc69c7e613b4d00dca2e1aa155ed702970e4b
Author: David M. Lee <dlee at digium.com>
Date:   Fri Oct 29 01:23:12 2010 -0500

    Hydra -> AsteriskSCF

diff --git a/server/config/logging-server.conf b/server/config/logging-server.conf
index 005c709..0cf4f37 100755
--- a/server/config/logging-server.conf
+++ b/server/config/logging-server.conf
@@ -11,7 +11,7 @@ AsteriskSCF.LoggingService.Endpoints=default
 ServiceLocatorManagement.Proxy=LocatorServiceManagement:tcp -p 4422
 
 # A proxy to the IceStorm topic manager
-TopicManager.Proxy=HydraIceStorm/TopicManager:default -p 10000
+TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
 
 # Log levels
 AsteriskSCF.Logging.logger=Error

commit 4ed6df5bc54b78a517191bf26241d1a35ba6c828
Author: David M. Lee <dlee at digium.com>
Date:   Fri Oct 29 01:22:47 2010 -0500

    Use IceBox.InheritProperties

diff --git a/server/config/logging-server.conf b/server/config/logging-server.conf
index ca14501..005c709 100755
--- a/server/config/logging-server.conf
+++ b/server/config/logging-server.conf
@@ -1,7 +1,8 @@
 # Configuration file for the logging server
 
 # load w/ icebox
-IceBox.Service.Logger=logging-service:createLoggingService --Ice.Config=server/config/logging-server.conf
+IceBox.InheritProperties=1
+IceBox.Service.Logger=logging-service:createLoggingService
 
 # Ice config
 AsteriskSCF.LoggingService.Endpoints=default

commit 9979ea91e3a771356975c929d4afc77ef036ef6a
Author: David M. Lee <dlee at digium.com>
Date:   Mon Oct 25 10:50:51 2010 -0500

    clean up license file

diff --git a/LICENSE.txt b/LICENSE.txt
index 4d5fc3e..ff0499c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,68 +1,71 @@
-Asterisk SCF is distributed by Digium, Inc. (Digium) under the 
-GNU General Public License version 2 (GPLv2) and is also available under 
-alternative licenses negotiated directly with Digium. If you obtained 
-Asterisk SCF under the GPLv2, then those terms apply to all programs 
-you distribute that communicate using the Asterisk SCF object interfaces 
-(APIs) on objects provided by Asterisk SCF’s components, as defined below. 
-A copy of the GPLv2 is included in the Asterisk SCF source tree in the 
-file COPYING.txt
+Asterisk SCF is distributed by Digium, Inc. (Digium) under the GNU
+General Public License version 2 (GPLv2) and is also available under
+alternative licenses negotiated directly with Digium. If you obtained
+Asterisk SCF under the GPLv2, then those terms apply to all programs
+you distribute that communicate using the Asterisk SCF object
+interfaces (APIs) on objects provided by Asterisk SCF's components, as
+defined below.  A copy of the GPLv2 is included in the Asterisk SCF
+source tree in the file COPYING.txt.
 
-Asterisk SCF is a collection of programs that communicate with each other 
-over defined APIs. This communication can occur within a single process 
-(if two programs are loaded into a suitable container), between processes 
-on a single machine, between processes on different machines, or some 
-combination. In addition, these APIs are usable across a number of 
-platforms and also across a variety of programming languages, many of 
-which are interpreted (scripting) languages. Because of this flexibility 
-and the possible ambiguity in interpretation of the provisions of the 
-GPLv2 as they apply to Asterisk SCF, Digium makes the following 
-statement:
+Asterisk SCF is a collection of programs that communicate with each
+other over defined APIs. This communication can occur within a single
+process (if two programs are loaded into a suitable container),
+between processes on a single machine, between processes on different
+machines, or some combination. In addition, these APIs are usable
+across a number of platforms and also across a variety of programming
+languages, many of which are interpreted (scripting)
+languages. Because of this flexibility and the possible ambiguity in
+interpretation of the provisions of the GPLv2 as they apply to
+Asterisk SCF, Digium makes the following statement:
 
-    It is Digium’s interpretation that because the Asterisk SCF APIs, 
-    by definition, expose direct, and indirect, complex remote, and non-remote, 
-    function calls on objects provided by Asterisk SCF’s programs, that usage 
-    of these APIs between the program hosting the object(s) and the program 
-    accessing the object(s) creates a derivative work that must be covered 
-    wholly by GPLv2, even if the mechanism used to invoke the function calls 
-    employs a cross-process or network connection. As a result, any program 
-    that employs the Asterisk SCF APIs to perform its intended functions, 
-    and would not be able to perform those intended functions without using 
-    these APIs to communicate with Asterisk SCF programs, or derivatives of 
-    Asterisk SCF programs, is subject to the terms of the GPLv2 when it is 
-    distributed, unless the distributor of the program has obtained explicit 
-    written permission from Digium to distribute it under a different 
-    license.
+    It is Digium's interpretation that because the Asterisk SCF APIs,
+    by definition, expose direct, and indirect, complex remote, and
+    non-remote, function calls on objects provided by Asterisk SCF's
+    programs, that usage of these APIs between the program hosting the
+    object(s) and the program accessing the object(s) creates a
+    derivative work that must be covered wholly by GPLv2, even if the
+    mechanism used to invoke the function calls employs a
+    cross-process or network connection. As a result, any program that
+    employs the Asterisk SCF APIs to perform its intended functions,
+    and would not be able to perform those intended functions without
+    using these APIs to communicate with Asterisk SCF programs, or
+    derivatives of Asterisk SCF programs, is subject to the terms of
+    the GPLv2 when it is distributed, unless the distributor of the
+    program has obtained explicit written permission from Digium to
+    distribute it under a different license.
 
-Digium is able to grant, at its sole discretion, permission for companies, 
-individuals or organizations to distribute programs that use the 
-Asterisk SCF APIs under open source or proprietary terms. Digium is able 
-to do this because all components of the Asterisk SCF package are either 
-copyrighted by Digium, because Digium has been granted a sufficient license 
-by the component’s copyright holder(s), or some combination thereof.
+Digium is able to grant, at its sole discretion, permission for
+companies, individuals or organizations to distribute programs that
+use the Asterisk SCF APIs under open source or proprietary
+terms. Digium is able to do this because all components of the
+Asterisk SCF package are either copyrighted by Digium, because Digium
+has been granted a sufficient license by the component's copyright
+holder(s), or some combination thereof.
 
-Digium grants specific permission for anyone to distribute programs that 
-use the Asterisk SCF APIs and also use the OpenSSL toolkit, 
-Ice (Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit 
-(“Open Source Exceptions”), even though the terms of the GPLv2 do not allow 
-such distribution. This permission only extends to distributions that 
-properly acknowledge and comply with the terms of the licenses on the 
-Open Source Exceptions that are used in addition to the terms of 
+Digium grants specific permission for anyone to distribute programs
+that use the Asterisk SCF APIs and also use the OpenSSL toolkit, Ice
+(Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit
+("Open Source Exceptions"), even though the terms of the GPLv2 do not
+allow such distribution. This permission only extends to distributions
+that properly acknowledge and comply with the terms of the licenses on
+the Open Source Exceptions that are used in addition to the terms of
 the GPLv2.
 
-If you wish to use Asterisk SCF code in other GPLv2 programs, there is 
-no requirement that you provide the same permissions for these 
-Open Source Exceptions to recipients of your programs (although if you 
-have written a program for Asterisk SCF, Digium would strongly encourage 
+If you wish to use Asterisk SCF code in other GPLv2 programs, there is
+no requirement that you provide the same permissions for these Open
+Source Exceptions to recipients of your programs (although if you have
+written a program for Asterisk SCF, Digium would strongly encourage
 you to grant the same permissions granted by Digium).
 
-The ‘Ice’ and ‘ZeroC’ names are trademarks of ZeroC, Inc.
+The 'Ice' and 'ZeroC' names are trademarks of ZeroC, Inc.
 
-The “Asterisk SCF” name and logos are trademarks owned by Digium and use 
-of them is subject to Digium’s trademark licensing policies. If you wish 
-to use these trademarks for purposes other than unmodified redistribution 
-of Asterisk SCF source code obtained from Digium, you should contact 
-Digium’s licensing department to determine the necessary steps you must 
-take. For more information on this policy, please read:
+The "Asterisk SCF" name and logos are trademarks owned by Digium and
+use of them is subject to Digium's trademark licensing policies. If
+you wish to use these trademarks for purposes other than unmodified
+redistribution of Asterisk SCF source code obtained from Digium, you
+should contact Digium's licensing department to determine the
+necessary steps you must take. For more information on this policy,
+please read:
 
 http://www.digium.com/en/company/profile/trademarkpolicy.php
 
@@ -72,9 +75,10 @@ If you have any questions regarding our licensing policy, please contact us:
 +1.256.428.6000 (via telephone outside the USA)
 +1.256.864.0464 (via FAX inside or outside the USA)
 IAX2/pbx.digium.com (via IAX2)
+sip:6000 at digium.com (via SIP)
 licensing at digium.com (via email)
 
 Digium, Inc.
 445 Jan Davis Drive NW
 Huntsville, AL 35806
-USA
\ No newline at end of file
+USA

commit c00522da3dbaa81d90384e9b6984f18cb1cbd08d
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Sun Oct 24 23:30:20 2010 -0500

    Updated copyright header to GPL V2.

diff --git a/client/src/IceConfigurator.cpp b/client/src/IceConfigurator.cpp
index c158e27..e7e5f60 100644
--- a/client/src/IceConfigurator.cpp
+++ b/client/src/IceConfigurator.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <Ice/Ice.h>
diff --git a/client/src/IceConfigurator.h b/client/src/IceConfigurator.h
index 9eb50d9..edcc385 100644
--- a/client/src/IceConfigurator.h
+++ b/client/src/IceConfigurator.h
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #pragma once
diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index 10f026c..84ff57f 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <IceStorm/IceStorm.h>
diff --git a/client/src/LogOut.cpp b/client/src/LogOut.cpp
index 078078c..7f361bb 100644
--- a/client/src/LogOut.cpp
+++ b/client/src/LogOut.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include "LogOut.h"
diff --git a/client/src/LogOut.h b/client/src/LogOut.h
index fc1ecef..67b7153 100755
--- a/client/src/LogOut.h
+++ b/client/src/LogOut.h
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #pragma once
diff --git a/client/src/Logger.cpp b/client/src/Logger.cpp
index 7dd9c05..5bf8e63 100644
--- a/client/src/Logger.cpp
+++ b/client/src/Logger.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <cassert>
diff --git a/client/src/LoggerFactory.cpp b/client/src/LoggerFactory.cpp
index 883cd35..eb3eaec 100644
--- a/client/src/LoggerFactory.cpp
+++ b/client/src/LoggerFactory.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <string>
diff --git a/client/src/OstreamLogger.cpp b/client/src/OstreamLogger.cpp
index 7465693..f108629 100644
--- a/client/src/OstreamLogger.cpp
+++ b/client/src/OstreamLogger.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include "logger.h"
diff --git a/client/src/logger.h b/client/src/logger.h
index 3347416..337d589 100755
--- a/client/src/logger.h
+++ b/client/src/logger.h
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #pragma once
diff --git a/client/test/IceConfigurator-test.cpp b/client/test/IceConfigurator-test.cpp
index db38a4d..ab4caee 100644
--- a/client/test/IceConfigurator-test.cpp
+++ b/client/test/IceConfigurator-test.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 
diff --git a/client/test/LogBuf-test.cpp b/client/test/LogBuf-test.cpp
index 04908b8..8d035f3 100644
--- a/client/test/LogBuf-test.cpp
+++ b/client/test/LogBuf-test.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 
diff --git a/client/test/Logger-test.cpp b/client/test/Logger-test.cpp
index df18fb2..dc8fea6 100644
--- a/client/test/Logger-test.cpp
+++ b/client/test/Logger-test.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <boost/test/unit_test.hpp>
diff --git a/client/test/LoggerFactory-test.cpp b/client/test/LoggerFactory-test.cpp
index 890d1c3..ceeb2dd 100644
--- a/client/test/LoggerFactory-test.cpp
+++ b/client/test/LoggerFactory-test.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <boost/test/unit_test.hpp>
diff --git a/client/test/client-test.cpp b/client/test/client-test.cpp
index e5a6cad..4b29507 100644
--- a/client/test/client-test.cpp
+++ b/client/test/client-test.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #define BOOST_TEST_MODULE Logger-client
diff --git a/client/test/scf-log.cpp b/client/test/scf-log.cpp
index 994cc40..07d88e8 100644
--- a/client/test/scf-log.cpp
+++ b/client/test/scf-log.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <Ice/Ice.h>
diff --git a/server/src/ChainedLogOut.cpp b/server/src/ChainedLogOut.cpp
index 5a14b2f..1f7a71c 100644
--- a/server/src/ChainedLogOut.cpp
+++ b/server/src/ChainedLogOut.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <iomanip>
diff --git a/server/src/ChainedLogOut.h b/server/src/ChainedLogOut.h
index bab7ba3..818c4c8 100644
--- a/server/src/ChainedLogOut.h
+++ b/server/src/ChainedLogOut.h
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #pragma once
diff --git a/server/src/FileChainedLogOut.cpp b/server/src/FileChainedLogOut.cpp
index 79566e5..3cfc889 100644
--- a/server/src/FileChainedLogOut.cpp
+++ b/server/src/FileChainedLogOut.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <IceUtil/IceUtil.h>
diff --git a/server/src/FileChainedLogOut.h b/server/src/FileChainedLogOut.h
index 6caf915..d84f2eb 100644
--- a/server/src/FileChainedLogOut.h
+++ b/server/src/FileChainedLogOut.h
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #pragma once
diff --git a/server/src/LoggingServer.cpp b/server/src/LoggingServer.cpp
index 71194e4..517a1e2 100644
--- a/server/src/LoggingServer.cpp
+++ b/server/src/LoggingServer.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <iomanip>
diff --git a/server/src/LoggingServer.h b/server/src/LoggingServer.h
index f3c4b9b..94b75b1 100644
--- a/server/src/LoggingServer.h
+++ b/server/src/LoggingServer.h
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #pragma once
diff --git a/server/src/OstreamChainedLogOut.cpp b/server/src/OstreamChainedLogOut.cpp
index b6a9e70..c7e00dc 100644
--- a/server/src/OstreamChainedLogOut.cpp
+++ b/server/src/OstreamChainedLogOut.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <IceUtil/IceUtil.h>
diff --git a/server/src/OstreamChainedLogOut.h b/server/src/OstreamChainedLogOut.h
index c4a3644..22c3a49 100644
--- a/server/src/OstreamChainedLogOut.h
+++ b/server/src/OstreamChainedLogOut.h
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #pragma once
diff --git a/server/src/main.cpp b/server/src/main.cpp
index 24c3894..3a68d37 100755
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <Ice/Ice.h>
diff --git a/server/test/LoggingServer-test.cpp b/server/test/LoggingServer-test.cpp
index 56b9f17..7801991 100644
--- a/server/test/LoggingServer-test.cpp
+++ b/server/test/LoggingServer-test.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #include <boost/test/unit_test.hpp>
diff --git a/server/test/server-test.cpp b/server/test/server-test.cpp
index 5cd29dc..3dbaff9 100644
--- a/server/test/server-test.cpp
+++ b/server/test/server-test.cpp
@@ -1,9 +1,17 @@
 /*
- * Asterisk Scalable Communications Framework
+ * Asterisk SCF -- An open-source communications framework.
  *
- * Copyright (C) 2010 -- Digium, Inc.
+ * Copyright (C) 2010, Digium, Inc.
  *
- * All rights reserved.
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
  */
 
 #define BOOST_TEST_MODULE Logger-server

commit b349c2a736bbcedaa54b3a1645a578876f73bed5
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Sun Oct 24 19:50:58 2010 -0500

    Added COPYING and LICENSE text files.

diff --git a/COPYING.txt b/COPYING.txt
new file mode 100644
index 0000000..cf87abb
--- /dev/null
+++ b/COPYING.txt
@@ -0,0 +1,340 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..4d5fc3e
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,80 @@
+Asterisk SCF is distributed by Digium, Inc. (Digium) under the 
+GNU General Public License version 2 (GPLv2) and is also available under 
+alternative licenses negotiated directly with Digium. If you obtained 
+Asterisk SCF under the GPLv2, then those terms apply to all programs 
+you distribute that communicate using the Asterisk SCF object interfaces 
+(APIs) on objects provided by Asterisk SCF’s components, as defined below. 
+A copy of the GPLv2 is included in the Asterisk SCF source tree in the 
+file COPYING.txt
+
+Asterisk SCF is a collection of programs that communicate with each other 
+over defined APIs. This communication can occur within a single process 
+(if two programs are loaded into a suitable container), between processes 
+on a single machine, between processes on different machines, or some 
+combination. In addition, these APIs are usable across a number of 
+platforms and also across a variety of programming languages, many of 
+which are interpreted (scripting) languages. Because of this flexibility 
+and the possible ambiguity in interpretation of the provisions of the 
+GPLv2 as they apply to Asterisk SCF, Digium makes the following 
+statement:
+
+    It is Digium’s interpretation that because the Asterisk SCF APIs, 
+    by definition, expose direct, and indirect, complex remote, and non-remote, 
+    function calls on objects provided by Asterisk SCF’s programs, that usage 
+    of these APIs between the program hosting the object(s) and the program 
+    accessing the object(s) creates a derivative work that must be covered 
+    wholly by GPLv2, even if the mechanism used to invoke the function calls 
+    employs a cross-process or network connection. As a result, any program 
+    that employs the Asterisk SCF APIs to perform its intended functions, 
+    and would not be able to perform those intended functions without using 
+    these APIs to communicate with Asterisk SCF programs, or derivatives of 
+    Asterisk SCF programs, is subject to the terms of the GPLv2 when it is 
+    distributed, unless the distributor of the program has obtained explicit 
+    written permission from Digium to distribute it under a different 
+    license.
+
+Digium is able to grant, at its sole discretion, permission for companies, 
+individuals or organizations to distribute programs that use the 
+Asterisk SCF APIs under open source or proprietary terms. Digium is able 
+to do this because all components of the Asterisk SCF package are either 
+copyrighted by Digium, because Digium has been granted a sufficient license 
+by the component’s copyright holder(s), or some combination thereof.
+
+Digium grants specific permission for anyone to distribute programs that 
+use the Asterisk SCF APIs and also use the OpenSSL toolkit, 
+Ice (Internet Communication Engine) from ZeroC and/or the UW IMAP toolkit 
+(“Open Source Exceptions”), even though the terms of the GPLv2 do not allow 
+such distribution. This permission only extends to distributions that 
+properly acknowledge and comply with the terms of the licenses on the 
+Open Source Exceptions that are used in addition to the terms of 
+the GPLv2.
+
+If you wish to use Asterisk SCF code in other GPLv2 programs, there is 
+no requirement that you provide the same permissions for these 
+Open Source Exceptions to recipients of your programs (although if you 
+have written a program for Asterisk SCF, Digium would strongly encourage 
+you to grant the same permissions granted by Digium).
+
+The ‘Ice’ and ‘ZeroC’ names are trademarks of ZeroC, Inc.
+
+The “Asterisk SCF” name and logos are trademarks owned by Digium and use 
+of them is subject to Digium’s trademark licensing policies. If you wish 
+to use these trademarks for purposes other than unmodified redistribution 
+of Asterisk SCF source code obtained from Digium, you should contact 
+Digium’s licensing department to determine the necessary steps you must 
+take. For more information on this policy, please read:
+
+http://www.digium.com/en/company/profile/trademarkpolicy.php
+
+If you have any questions regarding our licensing policy, please contact us:
+
++1.877.344.4861 (via telephone in the USA)
++1.256.428.6000 (via telephone outside the USA)
++1.256.864.0464 (via FAX inside or outside the USA)
+IAX2/pbx.digium.com (via IAX2)
+licensing at digium.com (via email)
+
+Digium, Inc.
+445 Jan Davis Drive NW
+Huntsville, AL 35806
+USA
\ No newline at end of file

commit e376034d1791e30821dc5f37bd64fd155643d478
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Oct 14 18:38:13 2010 -0500

    Replacing references to project's old internal working name.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca52922..72fbec5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,11 @@ if(NOT integrated_build STREQUAL "true")
     # Minimum we require is 2.6, any lower and stuff would fail horribly
     cmake_minimum_required(VERSION 2.6)
 
-    # Include common Hydra build infrastructure
+    # Include common AsteriskSCF build infrastructure
     include(cmake/AsteriskSCF.cmake)
 
     # This project is C++ based and requires a minimum of 3.4
-    hydra_project("Logger" 3.4 CXX)
+    asterisk_scf_project("Logger" 3.4 CXX)
 
     # Take care of slice definitions
     add_subdirectory(slice)
diff --git a/client/src/CMakeLists.txt b/client/src/CMakeLists.txt
index c97df57..74675bd 100644
--- a/client/src/CMakeLists.txt
+++ b/client/src/CMakeLists.txt
@@ -6,25 +6,25 @@
 # All rights reserved.
 #
 
-hydra_component_init(logging-client CXX)
+asterisk_scf_component_init(logging-client CXX)
 
 include_directories(../../common)
 
-hydra_component_add_file(logging-client Logger.cpp)
-hydra_component_add_file(logging-client LoggerFactory.cpp)
-hydra_component_add_file(logging-client LogOut.cpp)
-hydra_component_add_file(logging-client IceConfigurator.cpp)
-hydra_component_add_file(logging-client IceLogger.cpp)
-hydra_component_add_file(logging-client OstreamLogger.cpp)
-hydra_component_add_file(logging-client logger.h)
-hydra_component_add_file(logging-client IceConfigurator.h)
-hydra_component_add_file(logging-client LogOut.h)
+asterisk_scf_component_add_file(logging-client Logger.cpp)
+asterisk_scf_component_add_file(logging-client LoggerFactory.cpp)
+asterisk_scf_component_add_file(logging-client LogOut.cpp)
+asterisk_scf_component_add_file(logging-client IceConfigurator.cpp)
+asterisk_scf_component_add_file(logging-client IceLogger.cpp)
+asterisk_scf_component_add_file(logging-client OstreamLogger.cpp)
+asterisk_scf_component_add_file(logging-client logger.h)
+asterisk_scf_component_add_file(logging-client IceConfigurator.h)
+asterisk_scf_component_add_file(logging-client LogOut.h)
 
-hydra_component_add_slice(logging-client LoggerIf)
-hydra_component_add_slice(logging-client ServiceLocatorIf)
-hydra_component_add_slice(logging-client ServiceLocatorEventsIf)
+asterisk_scf_component_add_slice(logging-client LoggerIf)
+asterisk_scf_component_add_slice(logging-client ServiceLocatorIf)
+asterisk_scf_component_add_slice(logging-client ServiceLocatorEventsIf)
 
-hydra_add_boost_libraries(thread)
-hydra_add_ice_libraries(IceStorm)
+asterisk_scf_add_boost_libraries(thread)
+asterisk_scf_add_ice_libraries(IceStorm)
 
-hydra_component_build_library(logging-client)
+asterisk_scf_component_build_library(logging-client)
diff --git a/client/src/IceConfigurator.h b/client/src/IceConfigurator.h
index 33cb3d3..9eb50d9 100644
--- a/client/src/IceConfigurator.h
+++ b/client/src/IceConfigurator.h
@@ -29,15 +29,15 @@ public:
     {
     }
 
-    HYDRA_ICEBOX_EXPORT void configured(Configuration const &logConfiguration, Ice::Current const &);
-    HYDRA_ICEBOX_EXPORT void configured(Configuration const &logConfiguration);
+    ASTERISK_SCF_ICEBOX_EXPORT void configured(Configuration const &logConfiguration, Ice::Current const &);
+    ASTERISK_SCF_ICEBOX_EXPORT void configured(Configuration const &logConfiguration);
 private:
     LoggerFactory &mFactory;
 };
 
 typedef IceUtil::Handle<IceConfigurator> IceConfiguratorPtr;
 
-HYDRA_ICEBOX_EXPORT IceConfiguratorPtr createIceConfigurator(Ice::ObjectAdapterPtr adapter,
+ASTERISK_SCF_ICEBOX_EXPORT IceConfiguratorPtr createIceConfigurator(Ice::ObjectAdapterPtr adapter,
     LoggerFactory &factory);
 
 } // Logging
diff --git a/client/src/IceLogger.h b/client/src/IceLogger.h
index 5a056a0..49ea64e 100644
--- a/client/src/IceLogger.h
+++ b/client/src/IceLogger.h
@@ -90,7 +90,7 @@ typedef IceUtil::Handle<ConfiguredIceLogger> ConfiguredIceLoggerPtr;
  * @param adapter ObjectAdapter to use for listening to the Discovery topic.
  * @return Smart pointer to a new ConfiguredIceLogger.  Will never return null.
  */
-HYDRA_ICEBOX_EXPORT ConfiguredIceLoggerPtr createIceLogger(
+ASTERISK_SCF_ICEBOX_EXPORT ConfiguredIceLoggerPtr createIceLogger(
     Ice::ObjectAdapterPtr adapter);
 
 } // Logging
diff --git a/client/src/LogOut.h b/client/src/LogOut.h
index eca1f11..fc1ecef 100755
--- a/client/src/LogOut.h
+++ b/client/src/LogOut.h
@@ -25,8 +25,8 @@ namespace Logging
 class LogOut
 {
 public:
-    HYDRA_ICEBOX_EXPORT virtual ~LogOut();
-    HYDRA_ICEBOX_EXPORT virtual void logs(std::string const &name, Level logLevel,
+    ASTERISK_SCF_ICEBOX_EXPORT virtual ~LogOut();
+    ASTERISK_SCF_ICEBOX_EXPORT virtual void logs(std::string const &name, Level logLevel,
         std::string const &message) = 0;
 };
 
diff --git a/client/src/logger.h b/client/src/logger.h
index f7a3688..3347416 100755
--- a/client/src/logger.h
+++ b/client/src/logger.h
@@ -31,15 +31,15 @@ namespace Logging
 class LogBuf : public std::streambuf
 {
 public:
-    HYDRA_ICEBOX_EXPORT LogBuf(LogOut &out, std::string const &name, Level logLevel);
... 15834 lines suppressed ...


-- 
asterisk-scf/integration/logger.git