[asterisk-scf-commits] asterisk-scf/integration/ice-util-cpp.git branch "ice-util-restructure" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Apr 28 10:34:11 CDT 2011
branch "ice-util-restructure" has been created
at 172345423f821652d0a36ae723b9908518c36d70 (commit)
- Log -----------------------------------------------------------------
commit 172345423f821652d0a36ae723b9908518c36d70
Author: Brent Eagles <beagles at digium.com>
Date: Thu Apr 28 12:50:36 2011 -0230
* Grouped header files according to functional area.
* Added matching namespaces.
* Renamed library yet again (we need a standard for that.
diff --git a/config/IceUtilCppTests.conf b/config/IceUtilCppTests.conf
index d2f6915..745d32f 100644
--- a/config/IceUtilCppTests.conf
+++ b/config/IceUtilCppTests.conf
@@ -17,4 +17,4 @@ IceBox.ServiceManager.Endpoints=default -p 56000
IceBox.ServiceManager.ThreadPool.Size=4
IceBoxManager.Proxy=IceBox/ServiceManager:default -p 56000
-IceBox.Service.ProxyHelper=IceUtilCppTests:create
+IceBox.Service.ProxyHelper=ascf-ice-util-cpp-tests:create
diff --git a/include/AsteriskSCF/AmiCollector/AmiCollector.h b/include/AsteriskSCF/Async/AmiCollector.h
similarity index 96%
rename from include/AsteriskSCF/AmiCollector/AmiCollector.h
rename to include/AsteriskSCF/Async/AmiCollector.h
index 5cab70a..3bfc276 100644
--- a/include/AsteriskSCF/AmiCollector/AmiCollector.h
+++ b/include/AsteriskSCF/Async/AmiCollector.h
@@ -22,11 +22,12 @@
#include <IceUtil/Handle.h>
#include <IceUtil/Shared.h>
-#include <AsteriskSCF/AmiCollector/ResponseCollector.h>
+#include <AsteriskSCF/Async/ResponseCollector.h>
namespace AsteriskSCF
{
-
+namespace Async
+{
/**
* Collects the results for multiple asynchronous responses. While the response
* counting logic is properly locked and thread safe, it is incumbent upon the
@@ -120,4 +121,5 @@ private:
}
};
-} // AsteriskSCF
+} /* End of namespace Async */
+} /* End of namespace AsteriskSCF */
diff --git a/include/AsteriskSCF/AmiCollector/ResponseCollector.h b/include/AsteriskSCF/Async/ResponseCollector.h
similarity index 97%
rename from include/AsteriskSCF/AmiCollector/ResponseCollector.h
rename to include/AsteriskSCF/Async/ResponseCollector.h
index de2e011..d55f504 100644
--- a/include/AsteriskSCF/AmiCollector/ResponseCollector.h
+++ b/include/AsteriskSCF/Async/ResponseCollector.h
@@ -21,6 +21,8 @@
namespace AsteriskSCF
{
+namespace Async
+{
class TooManyInvocations : public std::exception
{
@@ -132,4 +134,5 @@ private:
}
};
-} // AsteriskSCF
+} /* End of namespace Async */
+} /* End of namespace AsteriskSCF */
diff --git a/include/AsteriskSCF/LocatorRegistration/LocatorRegistrationWrapper.h b/include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h
similarity index 98%
rename from include/AsteriskSCF/LocatorRegistration/LocatorRegistrationWrapper.h
rename to include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h
index 824ca15..4c4c098 100644
--- a/include/AsteriskSCF/LocatorRegistration/LocatorRegistrationWrapper.h
+++ b/include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h
@@ -22,6 +22,8 @@
namespace AsteriskSCF
{
+namespace Discovery
+{
/**
*
@@ -162,5 +164,6 @@ private:
bool mStopped;
};
+} /* End of namespace Discovery */
} /* End of namespace AsteriskSCF */
diff --git a/include/AsteriskSCF/SmartProxy/SmartProxy.h b/include/AsteriskSCF/Discovery/SmartProxy.h
similarity index 99%
rename from include/AsteriskSCF/SmartProxy/SmartProxy.h
rename to include/AsteriskSCF/Discovery/SmartProxy.h
index a49b1c8..05bf8d1 100644
--- a/include/AsteriskSCF/SmartProxy/SmartProxy.h
+++ b/include/AsteriskSCF/Discovery/SmartProxy.h
@@ -24,7 +24,7 @@
namespace AsteriskSCF
{
-namespace SmartProxy
+namespace Discovery
{
/**
diff --git a/include/AsteriskSCF/StateReplicator/StateReplicator.h b/include/AsteriskSCF/Replication/StateReplicator.h
similarity index 99%
rename from include/AsteriskSCF/StateReplicator/StateReplicator.h
rename to include/AsteriskSCF/Replication/StateReplicator.h
index 6ecebce..7fa586d 100644
--- a/include/AsteriskSCF/StateReplicator/StateReplicator.h
+++ b/include/AsteriskSCF/Replication/StateReplicator.h
@@ -22,7 +22,7 @@
namespace AsteriskSCF
{
-namespace StateReplication
+namespace Replication
{
/**
diff --git a/include/AsteriskSCF/Utilities.h b/include/AsteriskSCF/Utilities.h
index f06d8dc..5534b29 100644
--- a/include/AsteriskSCF/Utilities.h
+++ b/include/AsteriskSCF/Utilities.h
@@ -17,12 +17,12 @@
#pragma once
#include <AsteriskSCF/Helpers/ProxyHelper.h>
#include <AsteriskSCF/Helpers/PropertyHelper.h>
-#include <AsteriskSCF/LocatorRegistration/LocatorRegistrationWrapper.h>
+#include <AsteriskSCF/Discovery/LocatorRegistrationWrapper.h>
+#include <AsteriskSCF/Discovery/SmartProxy.h>
#include <AsteriskSCF/Listener/ListenerManager.h>
-#include <AsteriskSCF/AmiCollector/AmiCollector.h>
-#include <AsteriskSCF/AmiCollector/ResponseCollector.h>
-#include <AsteriskSCF/SmartProxy/SmartProxy.h>
-#include <AsteriskSCF/StateReplicator/StateReplicator.h>
+#include <AsteriskSCF/Async/AmiCollector.h>
+#include <AsteriskSCF/Async/ResponseCollector.h>
+#include <AsteriskSCF/Replication/StateReplicator.h>
//
// The testing header file is deliberately left out as it is not intended for use in implementing components.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 94bcd73..5266556 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,29 +8,29 @@
# Ice Utilities for C++
-asterisk_scf_component_init(IceUtilCpp CXX)
+asterisk_scf_component_init(ice-util-cpp)
include_directories(../include)
asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/SmartProxy/SmartProxy.h)
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/AmiCollector/AmiCollector.h)
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/AmiCollector/ResponseCollector.h)
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/Helpers/PropertyHelper.h)
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/Helpers/ProxyHelper.h)
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/Helpers/Retry.h)
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/Listener/ListenerManager.h)
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/LocatorRegistration/LocatorRegistrationWrapper.h)
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/StateReplicator/StateReplicator.h)
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/Utilities.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/SmartProxy.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Discovery/LocatorRegistrationWrapper.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/AmiCollector.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Async/ResponseCollector.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/PropertyHelper.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/ProxyHelper.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Helpers/Retry.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Listener/ListenerManager.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Replication/StateReplicator.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Utilities.h)
#
# Note, strictly speaking this isn't for component development, but as it is part of this
# library it sort of belongs here.
#
-asterisk_scf_component_add_file(IceUtilCpp ../include/AsteriskSCF/Testing/IceBoxBoostTest.h)
+asterisk_scf_component_add_file(ice-util-cpp ../include/AsteriskSCF/Testing/IceBoxBoostTest.h)
-asterisk_scf_component_add_file(IceUtilCpp IceUtilCpp.cpp)
-asterisk_scf_component_add_boost_libraries(IceUtilCpp core)
+asterisk_scf_component_add_file(ice-util-cpp IceUtilCpp.cpp)
+asterisk_scf_component_add_boost_libraries(ice-util-cpp core)
if(NOT logger_dir)
message(FATAL_ERROR "The logger directory could not be found ${logger_dir}")
@@ -38,11 +38,11 @@ endif()
include_directories(${logger_dir}/include)
include_directories(${API_INCLUDE_DIR})
-asterisk_scf_component_build_library(IceUtilCpp)
+asterisk_scf_component_build_library(ice-util-cpp)
include_directories(${API_INCLUDE_DIR})
-target_link_libraries(IceUtilCpp logging-client)
-target_link_libraries(IceUtilCpp asterisk-scf-api)
+target_link_libraries(ice-util-cpp logging-client)
+target_link_libraries(ice-util-cpp asterisk-scf-api)
# don't install the component. it's just there to make Visual Studio happy
# _do_ install the header files
diff --git a/test/AmiCollector/CMakeLists.txt b/test/Async/CMakeLists.txt
similarity index 100%
rename from test/AmiCollector/CMakeLists.txt
rename to test/Async/CMakeLists.txt
diff --git a/test/AmiCollector/IceIntegration-test.cpp b/test/Async/IceIntegration-test.cpp
similarity index 98%
rename from test/AmiCollector/IceIntegration-test.cpp
rename to test/Async/IceIntegration-test.cpp
index 43bfcee..019f4ea 100644
--- a/test/AmiCollector/IceIntegration-test.cpp
+++ b/test/Async/IceIntegration-test.cpp
@@ -18,7 +18,7 @@
#include <Ice/Proxy.h>
#include <boost/test/unit_test.hpp>
-#include <AsteriskSCF/AmiCollector/AmiCollector.h>
+#include <AsteriskSCF/Async/AmiCollector.h>
#include "TestAmiCollector.h"
diff --git a/test/AmiCollector/ResponseCollector-test.cpp b/test/Async/ResponseCollector-test.cpp
similarity index 95%
rename from test/AmiCollector/ResponseCollector-test.cpp
rename to test/Async/ResponseCollector-test.cpp
index 8b2950c..09bff4c 100644
--- a/test/AmiCollector/ResponseCollector-test.cpp
+++ b/test/Async/ResponseCollector-test.cpp
@@ -16,7 +16,7 @@
#include <boost/test/unit_test.hpp>
-#include <AsteriskSCF/AmiCollector/ResponseCollector.h>
+#include <AsteriskSCF/Async/ResponseCollector.h>
using namespace AsteriskSCF;
@@ -28,7 +28,7 @@ public:
const char* what() const throw() { return "TestException"; }
};
-class TestCollector : public ResponseCollector<bool>
+class TestCollector : public AsteriskSCF::Async::ResponseCollector<bool>
{
public:
/** Num results received */
diff --git a/test/AmiCollector/TestAmiCollector.h b/test/Async/TestAmiCollector.h
similarity index 94%
rename from test/AmiCollector/TestAmiCollector.h
rename to test/Async/TestAmiCollector.h
index e8bfd91..f30b66a 100644
--- a/test/AmiCollector/TestAmiCollector.h
+++ b/test/Async/TestAmiCollector.h
@@ -17,7 +17,7 @@
#include <boost/thread/condition_variable.hpp>
#include <IceUtil/Handle.h>
-#include <AsteriskSCF/AmiCollector/AmiCollector.h>
+#include <AsteriskSCF/Async/AmiCollector.h>
namespace AsteriskSCF
{
@@ -25,7 +25,7 @@ namespace AsteriskSCF
/**
* Simple AMI collector for testing
*/
-class TestAmiCollector : public AsteriskSCF::AmiCollector<
+class TestAmiCollector : public AsteriskSCF::Async::AmiCollector<
bool,
Ice::ObjectPrx,
&Ice::ObjectPrx::element_type::end_ice_isA>
diff --git a/test/AmiCollector/test.cpp b/test/Async/test.cpp
similarity index 100%
rename from test/AmiCollector/test.cpp
rename to test/Async/test.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 80e831a..40b9f87 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,22 +1,22 @@
asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-asterisk_scf_component_init(IceUtilCppTests CXX)
+asterisk_scf_component_init(ice-util-cpp-test CXX)
include_directories("../include")
-asterisk_scf_component_add_slice(IceUtilCppTests ./ProxyHelper/SimpleIf.ice)
-asterisk_scf_component_add_file(IceUtilCppTests ./LocatorRegistration/LocatorRegistrationTest.cpp)
-asterisk_scf_component_add_file(IceUtilCppTests ./LocatorRegistration/LocatorRegistrationTest.h)
-asterisk_scf_component_add_file(IceUtilCppTests ./PropertyHelper/PropertyHelperTest.cpp)
-asterisk_scf_component_add_file(IceUtilCppTests ./PropertyHelper/PropertyHelperTest.h)
-asterisk_scf_component_add_file(IceUtilCppTests ./ProxyHelper/ProxyHelperTests.cpp)
-asterisk_scf_component_add_file(IceUtilCppTests ./ProxyHelper/ProxyHelperTests.h)
-asterisk_scf_component_add_file(IceUtilCppTests UtilityTests.cpp)
+asterisk_scf_component_add_slice(ice-util-cpp-test ./ProxyHelper/SimpleIf.ice)
+asterisk_scf_component_add_file(ice-util-cpp-test ./LocatorRegistration/LocatorRegistrationTest.cpp)
+asterisk_scf_component_add_file(ice-util-cpp-test ./LocatorRegistration/LocatorRegistrationTest.h)
+asterisk_scf_component_add_file(ice-util-cpp-test ./PropertyHelper/PropertyHelperTest.cpp)
+asterisk_scf_component_add_file(ice-util-cpp-test ./PropertyHelper/PropertyHelperTest.h)
+asterisk_scf_component_add_file(ice-util-cpp-test ./ProxyHelper/ProxyHelperTests.cpp)
+asterisk_scf_component_add_file(ice-util-cpp-test ./ProxyHelper/ProxyHelperTests.h)
+asterisk_scf_component_add_file(ice-util-cpp-test UtilityTests.cpp)
-asterisk_scf_component_add_ice_libraries(IceUtilCppTests IceBox)
-asterisk_scf_component_add_boost_libraries(IceUtilCppTests unit_test_framework date_time thread)
+asterisk_scf_component_add_ice_libraries(ice-util-cpp-test IceBox)
+asterisk_scf_component_add_boost_libraries(ice-util-cpp-test unit_test_framework date_time thread)
include_directories(${API_INCLUDE_DIR})
-asterisk_scf_component_build_icebox(IceUtilCppTests)
-target_link_libraries(IceUtilCppTests asterisk-scf-api)
+asterisk_scf_component_build_icebox(ice-util-cpp-test)
+target_link_libraries(ice-util-cpp-test asterisk-scf-api)
-add_subdirectory(AmiCollector)
-add_subdirectory(StateReplicator)
+add_subdirectory(Async)
+add_subdirectory(Replication)
diff --git a/test/LocatorRegistration/LocatorRegistrationTest.cpp b/test/LocatorRegistration/LocatorRegistrationTest.cpp
index 9d84cc6..6ce9af5 100644
--- a/test/LocatorRegistration/LocatorRegistrationTest.cpp
+++ b/test/LocatorRegistration/LocatorRegistrationTest.cpp
@@ -18,7 +18,7 @@
#include <IceUtil/Thread.h>
#include <IceUtil/UUID.h>
-#include <AsteriskSCF/LocatorRegistration/LocatorRegistrationWrapper.h>
+#include <AsteriskSCF/Discovery/LocatorRegistrationWrapper.h>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
#include <AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.h>
@@ -38,6 +38,7 @@
using namespace std;
using namespace boost::unit_test;
+using namespace AsteriskSCF::Discovery;
namespace AsteriskSCF
{
diff --git a/test/StateReplicator/CMakeLists.txt b/test/Replication/CMakeLists.txt
similarity index 100%
rename from test/StateReplicator/CMakeLists.txt
rename to test/Replication/CMakeLists.txt
diff --git a/test/StateReplicator/MockStateReplicatorListener.h b/test/Replication/MockStateReplicatorListener.h
similarity index 100%
rename from test/StateReplicator/MockStateReplicatorListener.h
rename to test/Replication/MockStateReplicatorListener.h
diff --git a/test/StateReplicator/SharedTestData.h b/test/Replication/SharedTestData.h
similarity index 88%
rename from test/StateReplicator/SharedTestData.h
rename to test/Replication/SharedTestData.h
index a49e245..4a33cee 100644
--- a/test/StateReplicator/SharedTestData.h
+++ b/test/Replication/SharedTestData.h
@@ -24,7 +24,10 @@ namespace AsteriskSCF
namespace StateReplicatorTest
{
// typedef AsteriskSCF::StateReplication::StateReplicator<AsteriskSCF::StateReplicatorTest::V1::TestStateReplicator, AsteriskSCF::StateReplicatorTest::V1::TestStateItemSeq, AsteriskSCF::StateReplicatorTest::V1::TestStateItemPtr, Ice::StringSeq, std::string, AsteriskSCF::StateReplicatorTest::V1::TestStateReplicatorListenerPrx> TestReplicatorImpl;
-typedef AsteriskSCF::StateReplication::StateReplicator<AsteriskSCF::StateReplicatorTest::V1::TestStateReplicator, AsteriskSCF::StateReplicatorTest::V1::TestStateItemPtr, std::string, AsteriskSCF::StateReplicatorTest::V1::TestStateReplicatorListenerPrx> TestReplicatorImpl;
+typedef AsteriskSCF::Replication::StateReplicator<
+ AsteriskSCF::StateReplicatorTest::V1::TestStateReplicator,
+ AsteriskSCF::StateReplicatorTest::V1::TestStateItemPtr, std::string,
+ AsteriskSCF::StateReplicatorTest::V1::TestStateReplicatorListenerPrx> TestReplicatorImpl;
typedef IceUtil::Handle<TestReplicatorImpl> TestReplicatorImplPtr;
/**
diff --git a/test/StateReplicator/TestStateReplicator.cpp b/test/Replication/TestStateReplicator.cpp
similarity index 99%
rename from test/StateReplicator/TestStateReplicator.cpp
rename to test/Replication/TestStateReplicator.cpp
index 3adb9b2..d6d094c 100644
--- a/test/StateReplicator/TestStateReplicator.cpp
+++ b/test/Replication/TestStateReplicator.cpp
@@ -21,7 +21,7 @@
#include <Ice/Ice.h>
-#include <AsteriskSCF/StateReplicator/StateReplicator.h>
+#include <AsteriskSCF/Replication/StateReplicator.h>
#include <StateReplicatorTestIf.h>
#include "SharedTestData.h"
@@ -29,7 +29,7 @@
using namespace std;
using namespace AsteriskSCF::StateReplicatorTest::V1;
using namespace AsteriskSCF::StateReplicatorTest;
-using namespace AsteriskSCF::StateReplication;
+using namespace AsteriskSCF::Replication;
/**
* Instantiate our shared data.
diff --git a/test/StateReplicator/slice/StateReplicatorTestIf.ice b/test/Replication/slice/StateReplicatorTestIf.ice
similarity index 100%
rename from test/StateReplicator/slice/StateReplicatorTestIf.ice
rename to test/Replication/slice/StateReplicatorTestIf.ice
-----------------------------------------------------------------------
--
asterisk-scf/integration/ice-util-cpp.git
More information about the asterisk-scf-commits
mailing list