[asterisk-scf-commits] asterisk-scf/release/ice-util-cpp.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Dec 30 14:51:59 CST 2011
branch "master" has been updated
via 60d6e20934eba3fa76c3fed6bac751ef4bf61ec5 (commit)
via 6226bac6d0848d49d06103ac755b6fcf9374ceb6 (commit)
via c3f047f39429d06ccd722cbf8869991f5dfde4a6 (commit)
via 6653850ae7a78c26f58a12b5c34c3a72c5255f85 (commit)
from e61c48510445e079475a77e1a374225bc53cf768 (commit)
Summary of changes:
.../Async/{AmiCollector.h => AMICollector.h} | 10 +++---
include/AsteriskSCF/Collections/HandleSet.h | 2 +-
include/AsteriskSCF/Collections/LoggedSet.h | 2 +-
include/AsteriskSCF/Collections/ProxySet.h | 2 +-
include/AsteriskSCF/Component/Component.h | 2 +-
include/AsteriskSCF/Discovery/SmartProxy.h | 2 +-
include/AsteriskSCF/{PJLib => PJLIB}/ThreadHook.h | 12 +++---
include/AsteriskSCF/Utilities.h | 2 +-
src/CMakeLists.txt | 34 ++++++++++----------
src/CollocatedIceStorm/CMakeLists.txt | 2 +-
src/Component/CMakeLists.txt | 4 +-
src/Helpers/CMakeLists.txt | 2 +-
src/NAT/CMakeLists.txt | 2 +-
src/PJLIB/CMakeLists.txt | 1 +
src/{PJLib => PJLIB}/ThreadHook.cpp | 10 +++---
src/PJLib/CMakeLists.txt | 1 -
src/Replication/CMakeLists.txt | 2 +-
src/ThreadPool/CMakeLists.txt | 4 +-
src/WorkQueue/CMakeLists.txt | 6 ++--
test/Async/CMakeLists.txt | 2 +-
test/Async/IceIntegration-test.cpp | 14 ++++----
test/Async/ResponseCollector-test.cpp | 2 +-
.../{TestAmiCollector.h => TestAMICollector.h} | 10 +++---
test/CMakeLists.txt | 28 ++++++++--------
test/Collections/CMakeLists.txt | 2 +-
test/Collections/TestCollections.cpp | 2 +-
test/Component/CMakeLists.txt | 4 +-
test/Component/MockComponent.cpp | 2 +-
test/ThreadPool/CMakeLists.txt | 2 +-
test/WorkQueue/CMakeLists.txt | 4 +-
30 files changed, 87 insertions(+), 87 deletions(-)
rename include/AsteriskSCF/Async/{AmiCollector.h => AMICollector.h} (94%)
rename include/AsteriskSCF/{PJLib => PJLIB}/ThreadHook.h (91%)
create mode 100644 src/PJLIB/CMakeLists.txt
rename src/{PJLib => PJLIB}/ThreadHook.cpp (92%)
delete mode 100644 src/PJLib/CMakeLists.txt
rename test/Async/{TestAmiCollector.h => TestAMICollector.h} (87%)
- Log -----------------------------------------------------------------
commit 60d6e20934eba3fa76c3fed6bac751ef4bf61ec5
Merge: 6226bac e61c485
Author: Mark Michelson <mmichelson at digium.com>
Date: Fri Dec 30 14:53:25 2011 -0600
Merge branch 'master' of git.asterisk.org:asterisk-scf/release/ice-util-cpp
commit 6226bac6d0848d49d06103ac755b6fcf9374ceb6
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Dec 29 11:00:07 2011 -0600
Adjust names in media_rtp_pjmedia
diff --git a/include/AsteriskSCF/PJLib/ThreadHook.h b/include/AsteriskSCF/PJLIB/ThreadHook.h
similarity index 91%
rename from include/AsteriskSCF/PJLib/ThreadHook.h
rename to include/AsteriskSCF/PJLIB/ThreadHook.h
index 300ab45..1f35221 100644
--- a/include/AsteriskSCF/PJLib/ThreadHook.h
+++ b/include/AsteriskSCF/PJLIB/ThreadHook.h
@@ -30,13 +30,13 @@
namespace AsteriskSCF
{
-namespace PJLib
+namespace PJLIB
{
-class ASTSCF_DLL_EXPORT PJLibInitializationFailed : public std::exception
+class ASTSCF_DLL_EXPORT PJLIBInitializationFailed : public std::exception
{
public:
- PJLibInitializationFailed(pj_status_t res) : result(res)
+ PJLIBInitializationFailed(pj_status_t res) : result(res)
{
}
@@ -48,10 +48,10 @@ public:
const pj_status_t result;
};
-class ASTSCF_DLL_EXPORT PJLibUtilInitializationFailed : public std::exception
+class ASTSCF_DLL_EXPORT PJLIBUtilInitializationFailed : public std::exception
{
public:
- PJLibUtilInitializationFailed(pj_status_t res) : result(res)
+ PJLIBUtilInitializationFailed(pj_status_t res) : result(res)
{
}
@@ -145,6 +145,6 @@ private:
const std::string mThreadGroup;
};
-} // end namespace PJLib
+} // end namespace PJLIB
} // end namespace AsteriskSCF
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6b82a1d..bfb7d7c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,7 +16,7 @@ target_link_libraries(ASTSCFIceUtilCpp LoggingClient)
astscf_component_install(ASTSCFIceUtilCpp)
astscf_component_init(ASTSCFIceUtilCppPJLIB)
-add_subdirectory(PJLib)
+add_subdirectory(PJLIB)
astscf_component_add_boost_libraries(ASTSCFIceUtilCpp core)
astscf_component_build_library(ASTSCFIceUtilCppPJLIB STATIC)
if(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/src/PJLib/CMakeLists.txt b/src/PJLIB/CMakeLists.txt
similarity index 100%
rename from src/PJLib/CMakeLists.txt
rename to src/PJLIB/CMakeLists.txt
diff --git a/src/PJLib/ThreadHook.cpp b/src/PJLIB/ThreadHook.cpp
similarity index 92%
rename from src/PJLib/ThreadHook.cpp
rename to src/PJLIB/ThreadHook.cpp
index 5d3b887..9555d3e 100644
--- a/src/PJLib/ThreadHook.cpp
+++ b/src/PJLIB/ThreadHook.cpp
@@ -14,14 +14,14 @@
* at the top of the source tree.
*/
-#include <AsteriskSCF/PJLib/ThreadHook.h>
+#include <AsteriskSCF/PJLIB/ThreadHook.h>
#include <pjlib-util.h>
namespace AsteriskSCF
{
-namespace PJLib
+namespace PJLIB
{
bool ThreadHook::mpjInitialized;
@@ -42,13 +42,13 @@ ThreadHook::ThreadHook(const std::string& threadGroup) : mThreadGroup(threadGrou
pj_status_t status = pj_init();
if(status != PJ_SUCCESS)
{
- throw PJLibInitializationFailed(status);
+ throw PJLIBInitializationFailed(status);
}
status = pjlib_util_init();
if(status != PJ_SUCCESS)
{
- throw PJLibUtilInitializationFailed(status);
+ throw PJLIBUtilInitializationFailed(status);
}
mpjInitialized = true;
@@ -95,5 +95,5 @@ void ThreadHook::stop()
mpjThreads.erase(pj_thread_this());
}
-} // end namespace PJLib
+} // end namespace PJLIB
} // end namespace AsteriskSCF
commit c3f047f39429d06ccd722cbf8869991f5dfde4a6
Author: Mark Michelson <mmichelson at digium.com>
Date: Wed Dec 28 12:17:19 2011 -0600
Adjust for name changes in ice-util-cpp
diff --git a/include/AsteriskSCF/Async/AmiCollector.h b/include/AsteriskSCF/Async/AMICollector.h
similarity index 94%
rename from include/AsteriskSCF/Async/AmiCollector.h
rename to include/AsteriskSCF/Async/AMICollector.h
index 3bfc276..f3eec0a 100644
--- a/include/AsteriskSCF/Async/AmiCollector.h
+++ b/include/AsteriskSCF/Async/AMICollector.h
@@ -46,7 +46,7 @@ namespace Async
template<typename T,
typename P,
T (P::element_type::*EndFunction)(const Ice::AsyncResultPtr&)>
-class AmiCollector :
+class AMICollector :
public ::IceUtil::Shared,
public ResponseCollector<const Ice::AsyncResultPtr&>
{
@@ -57,8 +57,8 @@ public:
typedef typename P::element_type ElementType;
/** Return type for the end function */
typedef T AsyncResultType;
- /** The type for AmiCollector itself */
- typedef AmiCollector<T, P, EndFunction> AmiCollectorT;
+ /** The type for AMICollector itself */
+ typedef AMICollector<T, P, EndFunction> AMICollectorT;
/**
* Creates an Ice CallbackPtr wrapper around this object, for use with AMI.
@@ -66,7 +66,7 @@ public:
Ice::CallbackPtr newIceCallback()
{
// this happens prior to any callbacks, to no need to lock
- return Ice::newCallback(this, &AmiCollectorT::invoke);
+ return Ice::newCallback(this, &AMICollectorT::invoke);
}
/**
@@ -80,7 +80,7 @@ public:
protected:
/** Protected dtor prevents creating instances on the stack */
- virtual ~AmiCollector() {}
+ virtual ~AMICollector() {}
/** Called for each response received. */
virtual void processResult(AsyncResultType result) = 0;
/** Called for each exception received. */
diff --git a/include/AsteriskSCF/Utilities.h b/include/AsteriskSCF/Utilities.h
index 5534b29..74363be 100644
--- a/include/AsteriskSCF/Utilities.h
+++ b/include/AsteriskSCF/Utilities.h
@@ -20,7 +20,7 @@
#include <AsteriskSCF/Discovery/LocatorRegistrationWrapper.h>
#include <AsteriskSCF/Discovery/SmartProxy.h>
#include <AsteriskSCF/Listener/ListenerManager.h>
-#include <AsteriskSCF/Async/AmiCollector.h>
+#include <AsteriskSCF/Async/AMICollector.h>
#include <AsteriskSCF/Async/ResponseCollector.h>
#include <AsteriskSCF/Replication/StateReplicator.h>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fce98e2..6b82a1d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,6 @@
-astscf_component_init(astscf-ice-util-cpp)
+astscf_component_init(ASTSCFIceUtilCpp)
file(GLOB_RECURSE project_headers ../include/*.h)
-astscf_component_add_files(astscf-ice-util-cpp ${project_headers})
+astscf_component_add_files(ASTSCFIceUtilCpp ${project_headers})
add_subdirectory(CollocatedIceStorm)
add_subdirectory(Component)
add_subdirectory(Replication)
@@ -8,23 +8,23 @@ add_subdirectory(WorkQueue)
add_subdirectory(ThreadPool)
add_subdirectory(Helpers)
add_subdirectory(NAT)
-astscf_component_add_ice_libraries(astscf-ice-util-cpp IceStorm IceBox)
-astscf_component_add_boost_libraries(astscf-ice-util-cpp core thread date_time system)
-astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp ASTSCF)
-astscf_component_build_library(astscf-ice-util-cpp)
-target_link_libraries(astscf-ice-util-cpp LoggingClient)
-astscf_component_install(astscf-ice-util-cpp)
+astscf_component_add_ice_libraries(ASTSCFIceUtilCpp IceStorm IceBox)
+astscf_component_add_boost_libraries(ASTSCFIceUtilCpp core thread date_time system)
+astscf_component_add_slice_collection_libraries(ASTSCFIceUtilCpp ASTSCF)
+astscf_component_build_library(ASTSCFIceUtilCpp)
+target_link_libraries(ASTSCFIceUtilCpp LoggingClient)
+astscf_component_install(ASTSCFIceUtilCpp)
-astscf_component_init(astscf-ice-util-cpp-pjlib)
+astscf_component_init(ASTSCFIceUtilCppPJLIB)
add_subdirectory(PJLib)
-astscf_component_add_boost_libraries(astscf-ice-util-cpp core)
-astscf_component_build_library(astscf-ice-util-cpp-pjlib STATIC)
+astscf_component_add_boost_libraries(ASTSCFIceUtilCpp core)
+astscf_component_build_library(ASTSCFIceUtilCppPJLIB STATIC)
if(CMAKE_COMPILER_IS_GNUCXX)
if(CMAKE_SIZEOF_VOID_P MATCHES 8)
- set_target_properties(astscf-ice-util-cpp-pjlib PROPERTIES COMPILE_FLAGS -fPIC)
+ set_target_properties(ASTSCFIceUtilCppPJLIB PROPERTIES COMPILE_FLAGS -fPIC)
endif()
endif()
-target_link_libraries(astscf-ice-util-cpp LoggingClient)
-astscf_component_install(astscf-ice-util-cpp-pjlib)
-pjproject_link(astscf-ice-util-cpp-pjlib pjlib)
-pjproject_link(astscf-ice-util-cpp-pjlib pjlib-util)
+target_link_libraries(ASTSCFIceUtilCpp LoggingClient)
+astscf_component_install(ASTSCFIceUtilCppPJLIB)
+pjproject_link(ASTSCFIceUtilCppPJLIB pjlib)
+pjproject_link(ASTSCFIceUtilCppPJLIB pjlib-util)
diff --git a/src/CollocatedIceStorm/CMakeLists.txt b/src/CollocatedIceStorm/CMakeLists.txt
index 668f756..4ca476d 100644
--- a/src/CollocatedIceStorm/CMakeLists.txt
+++ b/src/CollocatedIceStorm/CMakeLists.txt
@@ -1 +1 @@
-astscf_component_add_files(astscf-ice-util-cpp CollocatedIceStorm.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp CollocatedIceStorm.cpp)
diff --git a/src/Component/CMakeLists.txt b/src/Component/CMakeLists.txt
index 34df0fa..7ef8530 100644
--- a/src/Component/CMakeLists.txt
+++ b/src/Component/CMakeLists.txt
@@ -1,2 +1,2 @@
-astscf_component_add_files(astscf-ice-util-cpp Component.cpp)
-astscf_component_add_files(astscf-ice-util-cpp TestContext.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp Component.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp TestContext.cpp)
diff --git a/src/Helpers/CMakeLists.txt b/src/Helpers/CMakeLists.txt
index 1c4069e..61dfeb4 100644
--- a/src/Helpers/CMakeLists.txt
+++ b/src/Helpers/CMakeLists.txt
@@ -1 +1 @@
-astscf_component_add_files(astscf-ice-util-cpp Network.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp Network.cpp)
diff --git a/src/NAT/CMakeLists.txt b/src/NAT/CMakeLists.txt
index b90886b..56d2bab 100644
--- a/src/NAT/CMakeLists.txt
+++ b/src/NAT/CMakeLists.txt
@@ -1 +1 @@
-astscf_component_add_files(astscf-ice-util-cpp Candidates.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp Candidates.cpp)
diff --git a/src/PJLib/CMakeLists.txt b/src/PJLib/CMakeLists.txt
index be5232e..2434a73 100644
--- a/src/PJLib/CMakeLists.txt
+++ b/src/PJLib/CMakeLists.txt
@@ -1 +1 @@
-astscf_component_add_files(astscf-ice-util-cpp-pjlib ThreadHook.cpp)
+astscf_component_add_files(ASTSCFIceUtilCppPJLIB ThreadHook.cpp)
diff --git a/src/Replication/CMakeLists.txt b/src/Replication/CMakeLists.txt
index 042453b..032d931 100644
--- a/src/Replication/CMakeLists.txt
+++ b/src/Replication/CMakeLists.txt
@@ -1 +1 @@
-astscf_component_add_files(astscf-ice-util-cpp ReplicationContext.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp ReplicationContext.cpp)
diff --git a/src/ThreadPool/CMakeLists.txt b/src/ThreadPool/CMakeLists.txt
index f16403e..bcf4ffe 100644
--- a/src/ThreadPool/CMakeLists.txt
+++ b/src/ThreadPool/CMakeLists.txt
@@ -1,2 +1,2 @@
-astscf_component_add_files(astscf-ice-util-cpp ThreadPool.cpp)
-astscf_component_add_files(astscf-ice-util-cpp WorkerThread.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp ThreadPool.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp WorkerThread.cpp)
diff --git a/src/WorkQueue/CMakeLists.txt b/src/WorkQueue/CMakeLists.txt
index a016def..308d53a 100644
--- a/src/WorkQueue/CMakeLists.txt
+++ b/src/WorkQueue/CMakeLists.txt
@@ -1,3 +1,3 @@
-astscf_component_add_files(astscf-ice-util-cpp WorkQueue.cpp)
-astscf_component_add_files(astscf-ice-util-cpp SuspendableWorkQueue.cpp)
-astscf_component_add_files(astscf-ice-util-cpp DefaultQueueListener.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp WorkQueue.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp SuspendableWorkQueue.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp DefaultQueueListener.cpp)
diff --git a/test/Async/CMakeLists.txt b/test/Async/CMakeLists.txt
index 9367567..2f8e36f 100644
--- a/test/Async/CMakeLists.txt
+++ b/test/Async/CMakeLists.txt
@@ -1,7 +1,7 @@
astscf_component_init(ami-collector-test)
astscf_component_add_files(ami-collector-test ResponseCollector-test.cpp)
astscf_component_add_files(ami-collector-test IceIntegration-test.cpp)
-astscf_component_add_files(ami-collector-test TestAmiCollector.h)
+astscf_component_add_files(ami-collector-test TestAMICollector.h)
astscf_component_add_files(ami-collector-test test.cpp)
astscf_component_add_boost_libraries(ami-collector-test unit_test_framework thread date_time)
astscf_component_build_standalone(ami-collector-test)
diff --git a/test/Async/IceIntegration-test.cpp b/test/Async/IceIntegration-test.cpp
index 019f4ea..91462e9 100644
--- a/test/Async/IceIntegration-test.cpp
+++ b/test/Async/IceIntegration-test.cpp
@@ -18,9 +18,9 @@
#include <Ice/Proxy.h>
#include <boost/test/unit_test.hpp>
-#include <AsteriskSCF/Async/AmiCollector.h>
+#include <AsteriskSCF/Async/AMICollector.h>
-#include "TestAmiCollector.h"
+#include "TestAMICollector.h"
using namespace AsteriskSCF;
@@ -51,11 +51,11 @@ struct Fixture
Ice::ObjectPrx proxy;
};
-BOOST_FIXTURE_TEST_SUITE(AmiCollectorIceIntegration, Fixture)
+BOOST_FIXTURE_TEST_SUITE(AMICollectorIceIntegration, Fixture)
BOOST_AUTO_TEST_CASE(test_zero)
{
- TestAmiCollectorPtr uut = new TestAmiCollector(0);
+ TestAMICollectorPtr uut = new TestAMICollector(0);
uut->newIceCallback();
uut->waitForCompletion();
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE(test_zero)
BOOST_AUTO_TEST_CASE(test_one)
{
- TestAmiCollectorPtr uut = new TestAmiCollector(1);
+ TestAMICollectorPtr uut = new TestAMICollector(1);
BOOST_CHECK_EQUAL(0, uut->results);
BOOST_CHECK_EQUAL(0, uut->exceptions);
@@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE(test_one)
BOOST_AUTO_TEST_CASE(test_exception)
{
- TestAmiCollectorPtr uut = new TestAmiCollector(1);
+ TestAMICollectorPtr uut = new TestAMICollector(1);
// by destroying the adapter, we should get an exception back
adapter->destroy();
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(test_exception)
BOOST_AUTO_TEST_CASE(test_some)
{
- TestAmiCollectorPtr uut = new TestAmiCollector(5);
+ TestAMICollectorPtr uut = new TestAMICollector(5);
proxy->begin_ice_isA("::Ice::Object", uut->newIceCallback());
proxy->begin_ice_isA("::Ice::Object", uut->newIceCallback());
diff --git a/test/Async/ResponseCollector-test.cpp b/test/Async/ResponseCollector-test.cpp
index 09bff4c..b28e2d1 100644
--- a/test/Async/ResponseCollector-test.cpp
+++ b/test/Async/ResponseCollector-test.cpp
@@ -55,7 +55,7 @@ public:
} // namespace
-BOOST_AUTO_TEST_SUITE(AmiCollectorTest)
+BOOST_AUTO_TEST_SUITE(AMICollectorTest)
BOOST_AUTO_TEST_CASE(test_zero)
{
diff --git a/test/Async/TestAmiCollector.h b/test/Async/TestAMICollector.h
similarity index 87%
rename from test/Async/TestAmiCollector.h
rename to test/Async/TestAMICollector.h
index f30b66a..27b175b 100644
--- a/test/Async/TestAmiCollector.h
+++ b/test/Async/TestAMICollector.h
@@ -17,7 +17,7 @@
#include <boost/thread/condition_variable.hpp>
#include <IceUtil/Handle.h>
-#include <AsteriskSCF/Async/AmiCollector.h>
+#include <AsteriskSCF/Async/AMICollector.h>
namespace AsteriskSCF
{
@@ -25,13 +25,13 @@ namespace AsteriskSCF
/**
* Simple AMI collector for testing
*/
-class TestAmiCollector : public AsteriskSCF::Async::AmiCollector<
+class TestAMICollector : public AsteriskSCF::Async::AMICollector<
bool,
Ice::ObjectPrx,
&Ice::ObjectPrx::element_type::end_ice_isA>
{
public:
- explicit TestAmiCollector(size_t n) :
+ explicit TestAMICollector(size_t n) :
results(0),
exceptions(0),
complete(false)
@@ -56,7 +56,7 @@ public:
}
protected:
- ~TestAmiCollector() {}
+ ~TestAMICollector() {}
void processResult(AsyncResultType)
{
++results;
@@ -77,6 +77,6 @@ private:
boost::condition_variable cond;
};
-typedef ::IceUtil::Handle<TestAmiCollector> TestAmiCollectorPtr;
+typedef ::IceUtil::Handle<TestAMICollector> TestAMICollectorPtr;
} // AsteriskSCF
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 068c0ed..3031d1e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,18 +1,18 @@
-astscf_component_init(astscf-ice-util-cpp-test)
+astscf_component_init(ASTSCFIceUtilCpp-test)
astscf_slice_collection(LOCAL PATH "${CMAKE_CURRENT_SOURCE_DIR}")
-astscf_component_add_slices(astscf-ice-util-cpp-test LOCAL ProxyHelper/SimpleIf.ice)
-astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
-astscf_component_add_files(astscf-ice-util-cpp-test LocatorRegistration/LocatorRegistrationTest.h)
-astscf_component_add_files(astscf-ice-util-cpp-test PropertyHelper/PropertyHelperTest.cpp)
-astscf_component_add_files(astscf-ice-util-cpp-test PropertyHelper/PropertyHelperTest.h)
-astscf_component_add_files(astscf-ice-util-cpp-test ProxyHelper/ProxyHelperTests.cpp)
-astscf_component_add_files(astscf-ice-util-cpp-test ProxyHelper/ProxyHelperTests.h)
-astscf_component_add_files(astscf-ice-util-cpp-test UtilityTests.cpp)
-astscf_component_add_ice_libraries(astscf-ice-util-cpp-test IceBox)
-astscf_component_add_boost_libraries(astscf-ice-util-cpp-test unit_test_framework date_time thread)
-astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp-test ASTSCF)
-astscf_component_build_icebox(astscf-ice-util-cpp-test)
-astscf_test_icebox(astscf-ice-util-cpp-test config/IceUtilCppTests.conf)
+astscf_component_add_slices(ASTSCFIceUtilCpp-test LOCAL ProxyHelper/SimpleIf.ice)
+astscf_component_add_files(ASTSCFIceUtilCpp-test LocatorRegistration/LocatorRegistrationTest.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp-test LocatorRegistration/LocatorRegistrationTest.h)
+astscf_component_add_files(ASTSCFIceUtilCpp-test PropertyHelper/PropertyHelperTest.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp-test PropertyHelper/PropertyHelperTest.h)
+astscf_component_add_files(ASTSCFIceUtilCpp-test ProxyHelper/ProxyHelperTests.cpp)
+astscf_component_add_files(ASTSCFIceUtilCpp-test ProxyHelper/ProxyHelperTests.h)
+astscf_component_add_files(ASTSCFIceUtilCpp-test UtilityTests.cpp)
+astscf_component_add_ice_libraries(ASTSCFIceUtilCpp-test IceBox)
+astscf_component_add_boost_libraries(ASTSCFIceUtilCpp-test unit_test_framework date_time thread)
+astscf_component_add_slice_collection_libraries(ASTSCFIceUtilCpp-test ASTSCF)
+astscf_component_build_icebox(ASTSCFIceUtilCpp-test)
+astscf_test_icebox(ASTSCFIceUtilCpp-test config/IceUtilCppTests.conf)
add_subdirectory(Async)
add_subdirectory(Component)
diff --git a/test/Component/CMakeLists.txt b/test/Component/CMakeLists.txt
index 4dd768e..e274cf4 100644
--- a/test/Component/CMakeLists.txt
+++ b/test/Component/CMakeLists.txt
@@ -10,7 +10,7 @@ astscf_component_add_files(component-base-test-mockcomponent MockComponent.cpp)
astscf_component_add_boost_libraries(component-base-test-mockcomponent date_time thread)
astscf_component_add_slice_collection_libraries(component-base-test-mockcomponent ASTSCF)
astscf_component_build_icebox(component-base-test-mockcomponent)
-target_link_libraries(component-base-test-mockcomponent astscf-ice-util-cpp LoggingClient)
+target_link_libraries(component-base-test-mockcomponent ASTSCFIceUtilCpp LoggingClient)
# A test driver.
astscf_component_init(component-base-test)
@@ -20,6 +20,6 @@ astscf_component_add_files(component-base-test ComponentTest.cpp)
astscf_component_add_boost_libraries(component-base-test unit_test_framework thread)
astscf_component_add_slice_collection_libraries(component-base-test ASTSCF)
astscf_component_build_icebox(component-base-test)
-target_link_libraries(component-base-test astscf-ice-util-cpp LoggingClient)
+target_link_libraries(component-base-test ASTSCFIceUtilCpp LoggingClient)
astscf_test_icebox(component-base-test test/Component/component-base-test.conf)
diff --git a/test/ThreadPool/CMakeLists.txt b/test/ThreadPool/CMakeLists.txt
index 949333e..a0ab2fa 100644
--- a/test/ThreadPool/CMakeLists.txt
+++ b/test/ThreadPool/CMakeLists.txt
@@ -4,5 +4,5 @@ astscf_component_add_files(ThreadPoolTest test.cpp)
astscf_component_add_boost_libraries(ThreadPoolTest unit_test_framework)
astscf_component_add_slice_collection_libraries(ThreadPoolTest ASTSCF)
astscf_component_build_standalone(ThreadPoolTest)
-target_link_libraries(ThreadPoolTest astscf-ice-util-cpp)
+target_link_libraries(ThreadPoolTest ASTSCFIceUtilCpp)
astscf_test_boost(ThreadPoolTest)
diff --git a/test/WorkQueue/CMakeLists.txt b/test/WorkQueue/CMakeLists.txt
index 9a7abb5..8862355 100644
--- a/test/WorkQueue/CMakeLists.txt
+++ b/test/WorkQueue/CMakeLists.txt
@@ -4,7 +4,7 @@ astscf_component_add_files(WorkQueueTest test.cpp)
astscf_component_add_boost_libraries(WorkQueueTest unit_test_framework)
astscf_component_add_slice_collection_libraries(WorkQueueTest ASTSCF)
astscf_component_build_standalone(WorkQueueTest)
-target_link_libraries(WorkQueueTest astscf-ice-util-cpp)
+target_link_libraries(WorkQueueTest ASTSCFIceUtilCpp)
astscf_test_boost(WorkQueueTest)
astscf_component_init(SuspendableWorkQueueTest)
@@ -13,5 +13,5 @@ astscf_component_add_files(SuspendableWorkQueueTest test2.cpp)
astscf_component_add_boost_libraries(SuspendableWorkQueueTest unit_test_framework thread)
astscf_component_add_slice_collection_libraries(SuspendableWorkQueueTest ASTSCF)
astscf_component_build_standalone(SuspendableWorkQueueTest)
-target_link_libraries(SuspendableWorkQueueTest astscf-ice-util-cpp)
+target_link_libraries(SuspendableWorkQueueTest ASTSCFIceUtilCpp)
astscf_test_boost(SuspendableWorkQueueTest)
commit 6653850ae7a78c26f58a12b5c34c3a72c5255f85
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Dec 27 16:35:28 2011 -0600
Adjust for logging name changes.
diff --git a/include/AsteriskSCF/Collections/HandleSet.h b/include/AsteriskSCF/Collections/HandleSet.h
index 04772d9..c0dd461 100644
--- a/include/AsteriskSCF/Collections/HandleSet.h
+++ b/include/AsteriskSCF/Collections/HandleSet.h
@@ -23,7 +23,7 @@
#include <Ice/Ice.h>
#include <AsteriskSCF/System/ExceptionsIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Helpers/ProxyHelper.h>
#include <AsteriskSCF/Collections/LoggedSet.h>
diff --git a/include/AsteriskSCF/Collections/LoggedSet.h b/include/AsteriskSCF/Collections/LoggedSet.h
index 4edc4ee..704b126 100644
--- a/include/AsteriskSCF/Collections/LoggedSet.h
+++ b/include/AsteriskSCF/Collections/LoggedSet.h
@@ -23,7 +23,7 @@
#include <Ice/Ice.h>
#include <AsteriskSCF/System/ExceptionsIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Helpers/ProxyHelper.h>
namespace AsteriskSCF
diff --git a/include/AsteriskSCF/Collections/ProxySet.h b/include/AsteriskSCF/Collections/ProxySet.h
index 8f41b6e..c49e706 100644
--- a/include/AsteriskSCF/Collections/ProxySet.h
+++ b/include/AsteriskSCF/Collections/ProxySet.h
@@ -23,7 +23,7 @@
#include <Ice/Ice.h>
#include <AsteriskSCF/System/ExceptionsIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Helpers/ProxyHelper.h>
#include <AsteriskSCF/Collections/LoggedSet.h>
diff --git a/include/AsteriskSCF/Component/Component.h b/include/AsteriskSCF/Component/Component.h
index 176c967..e29ded6 100644
--- a/include/AsteriskSCF/Component/Component.h
+++ b/include/AsteriskSCF/Component/Component.h
@@ -20,7 +20,7 @@
#include <boost/shared_ptr.hpp>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Replication/ReplicationContext.h>
#include <AsteriskSCF/Component/TestContext.h>
#include <AsteriskSCF/Discovery/LocatorRegistrationWrapper.h>
diff --git a/include/AsteriskSCF/Discovery/SmartProxy.h b/include/AsteriskSCF/Discovery/SmartProxy.h
index 6cf287c..6ab22a7 100644
--- a/include/AsteriskSCF/Discovery/SmartProxy.h
+++ b/include/AsteriskSCF/Discovery/SmartProxy.h
@@ -19,7 +19,7 @@
#include <Ice/Ice.h>
#include <IceUtil/Mutex.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
namespace AsteriskSCF
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 15ed730..fce98e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,7 @@ astscf_component_add_ice_libraries(astscf-ice-util-cpp IceStorm IceBox)
astscf_component_add_boost_libraries(astscf-ice-util-cpp core thread date_time system)
astscf_component_add_slice_collection_libraries(astscf-ice-util-cpp ASTSCF)
astscf_component_build_library(astscf-ice-util-cpp)
-target_link_libraries(astscf-ice-util-cpp logging-client)
+target_link_libraries(astscf-ice-util-cpp LoggingClient)
astscf_component_install(astscf-ice-util-cpp)
astscf_component_init(astscf-ice-util-cpp-pjlib)
@@ -24,7 +24,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(astscf-ice-util-cpp-pjlib PROPERTIES COMPILE_FLAGS -fPIC)
endif()
endif()
-target_link_libraries(astscf-ice-util-cpp logging-client)
+target_link_libraries(astscf-ice-util-cpp LoggingClient)
astscf_component_install(astscf-ice-util-cpp-pjlib)
pjproject_link(astscf-ice-util-cpp-pjlib pjlib)
pjproject_link(astscf-ice-util-cpp-pjlib pjlib-util)
diff --git a/test/Collections/CMakeLists.txt b/test/Collections/CMakeLists.txt
index 87768a6..82f7834 100644
--- a/test/Collections/CMakeLists.txt
+++ b/test/Collections/CMakeLists.txt
@@ -7,4 +7,4 @@ astscf_component_add_boost_libraries(CollectionsTest unit_test_framework thread
astscf_component_add_slice_collection_libraries(CollectionsTest ASTSCF)
astscf_component_build_icebox(CollectionsTest)
astscf_test_icebox(CollectionsTest test/Collections/TestCollections.conf)
-target_link_libraries(CollectionsTest logging-client)
+target_link_libraries(CollectionsTest LoggingClient)
diff --git a/test/Collections/TestCollections.cpp b/test/Collections/TestCollections.cpp
index ac1ccf7..d13f32e 100644
--- a/test/Collections/TestCollections.cpp
+++ b/test/Collections/TestCollections.cpp
@@ -20,7 +20,7 @@
#include <boost/test/debug.hpp>
#include <Ice/Ice.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include <AsteriskSCF/Testing/IceBoxBoostTest.h>
#include <TestCollectionsIf.h>
diff --git a/test/Component/CMakeLists.txt b/test/Component/CMakeLists.txt
index 0b24e7b..4dd768e 100644
--- a/test/Component/CMakeLists.txt
+++ b/test/Component/CMakeLists.txt
@@ -10,7 +10,7 @@ astscf_component_add_files(component-base-test-mockcomponent MockComponent.cpp)
astscf_component_add_boost_libraries(component-base-test-mockcomponent date_time thread)
astscf_component_add_slice_collection_libraries(component-base-test-mockcomponent ASTSCF)
astscf_component_build_icebox(component-base-test-mockcomponent)
-target_link_libraries(component-base-test-mockcomponent astscf-ice-util-cpp logging-client)
+target_link_libraries(component-base-test-mockcomponent astscf-ice-util-cpp LoggingClient)
# A test driver.
astscf_component_init(component-base-test)
@@ -20,6 +20,6 @@ astscf_component_add_files(component-base-test ComponentTest.cpp)
astscf_component_add_boost_libraries(component-base-test unit_test_framework thread)
astscf_component_add_slice_collection_libraries(component-base-test ASTSCF)
astscf_component_build_icebox(component-base-test)
-target_link_libraries(component-base-test astscf-ice-util-cpp logging-client)
+target_link_libraries(component-base-test astscf-ice-util-cpp LoggingClient)
astscf_test_icebox(component-base-test test/Component/component-base-test.conf)
diff --git a/test/Component/MockComponent.cpp b/test/Component/MockComponent.cpp
index d36330c..96dd1db 100644
--- a/test/Component/MockComponent.cpp
+++ b/test/Component/MockComponent.cpp
@@ -16,7 +16,7 @@
#include <AsteriskSCF/Component/Component.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
#include "ComponentTestIf.h"
using namespace AsteriskSCF::System::Logging;
-----------------------------------------------------------------------
--
asterisk-scf/release/ice-util-cpp.git
More information about the asterisk-scf-commits
mailing list