[asterisk-scf-commits] asterisk-scf/integration/test_channel.git branch "retry_deux" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Mar 22 11:35:10 CDT 2012
branch "retry_deux" has been updated
via de8c259b3380c57850a48910697b1d4e39d03e82 (commit)
via 917646976a4fec2053e33e074ba344e865c07e61 (commit)
via db6f6d2229821b9d2382fcd80870979e081e4b0a (commit)
via 7b1b2d7e9ca1ab56e2080fca98c76f020c4a3b36 (commit)
via 2df267b26a355a6ebc743fda8d437c685e89d49e (commit)
via 0117d4b9d993671d0eb84b38df579f7a55c6aa61 (commit)
from 76fe971c354aaee7c878b5c45f4494a695a94a73 (commit)
Summary of changes:
config/test_channel.conf | 6 ++--
src/CMakeLists.txt | 48 +++++++++++++++++++++++-----------------------
src/TestEndpoint.cpp | 1 +
3 files changed, 28 insertions(+), 27 deletions(-)
- Log -----------------------------------------------------------------
commit de8c259b3380c57850a48910697b1d4e39d03e82
Author: Brent Eagles <beagles at digium.com>
Date: Thu Mar 22 14:04:01 2012 -0230
Merge lib name fixes, etc. from recent changes from master.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 57e4eaf..3819295 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,7 +18,7 @@ astscf_component_add_ice_libraries(TestChannel IceStorm)
astscf_component_add_boost_libraries(TestChannel thread date_time)
astscf_component_add_slice_collection_libraries(TestChannel ASTSCF TEST_CHANNEL)
astscf_component_build_icebox(TestChannel)
-target_link_libraries(TestChannel LoggingClient)
+target_link_libraries(TestChannel LoggingClient ASTSCFIceUtilCpp)
astscf_component_install(TestChannel)
astscf_component_init(ConsoleDriver)
@@ -26,5 +26,5 @@ astscf_component_add_files(ConsoleDriver ConsoleDriver.cpp)
astscf_component_add_files(ConsoleDriver ConsoleDriver.h)
astscf_component_add_files(ConsoleDriver main.cpp)
astscf_component_add_slice_collection_libraries(ConsoleDriver TEST_CHANNEL)
-astscf_component_build_standalone(ConsoleDriver)
+astscf_component_build_standalone(ConsoleDriver ASTSCFIceUtilCpp)
astscf_component_install(ConsoleDriver)
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 49bec9b..98d9d23 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -251,12 +251,7 @@ public:
NamePtr name = new Name("bar");
NumberPtr number = new Number("100");
-<<<<<<< HEAD
IdPtr testId = new Id(name, number, new Privacy(false));
-=======
- PrivacyPtr privacy = new Privacy(false);
- IdPtr testId = new Id(name, number, privacy);
->>>>>>> master
IdSeq idSeq;
idSeq.push_back(testId);
mCaller = new Caller(idSeq);
@@ -265,36 +260,22 @@ public:
NamePtr dialedName = new Name("foo");
NumberPtr dialedNumber = new Number("104");
-<<<<<<< HEAD
IdPtr dialedId = new Id(dialedName, dialedNumber, new Privacy(false));
-=======
- PrivacyPtr dialedPrivacy = new Privacy(false);
- IdPtr dialedId = new Id(dialedName, dialedNumber, dialedPrivacy);
->>>>>>> master
IdSeq dialedSeq;
dialedSeq.push_back(dialedId);
mDialed = new Dialed(dialedNumber);
NamePtr redirName = new Name("scud");
NumberPtr redirNumber = new Number("666");
-<<<<<<< HEAD
+
IdPtr connectedId = new Id(redirName, redirNumber, new Privacy(false));
-=======
- PrivacyPtr redirPrivacy = new Privacy(false);
- IdPtr connectedId = new Id(redirName, redirNumber, redirPrivacy);
->>>>>>> master
IdSeq idSeq2;
idSeq2.push_back(connectedId);
mConnectedLine = new ConnectedLine(idSeq2);
RedirectionSeq redirects;
-<<<<<<< HEAD
RedirectionPtr redirect = new Redirection(dialedId, connectedId,
new RedirectionReason(Unavailable));
-=======
- RedirectionReasonPtr reason = new RedirectionReason(AsteriskSCF::SessionCommunications::PartyIdentification::V1::Unknown);
- RedirectionPtr redirect = new Redirection(dialedId, connectedId, reason);
->>>>>>> master
redirects.push_back(redirect);
mRedirections = new Redirections(redirects);
commit 917646976a4fec2053e33e074ba344e865c07e61
Merge: 76fe971 db6f6d2
Author: Brent Eagles <beagles at digium.com>
Date: Thu Mar 22 12:22:23 2012 -0230
Merge branch 'master' into retry_deux
diff --cc src/CMakeLists.txt
index a40f59b,57e4eaf..57e4eaf
mode 100755,100644..100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
diff --cc src/TestEndpoint.cpp
index 33d9a47,a8996c8..49bec9b
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@@ -251,7 -231,8 +251,12 @@@ public
NamePtr name = new Name("bar");
NumberPtr number = new Number("100");
++<<<<<<< HEAD
+ IdPtr testId = new Id(name, number, new Privacy(false));
++=======
+ PrivacyPtr privacy = new Privacy(false);
+ IdPtr testId = new Id(name, number, privacy);
++>>>>>>> master
IdSeq idSeq;
idSeq.push_back(testId);
mCaller = new Caller(idSeq);
@@@ -260,21 -241,23 +265,36 @@@
NamePtr dialedName = new Name("foo");
NumberPtr dialedNumber = new Number("104");
++<<<<<<< HEAD
+ IdPtr dialedId = new Id(dialedName, dialedNumber, new Privacy(false));
++=======
+ PrivacyPtr dialedPrivacy = new Privacy(false);
+ IdPtr dialedId = new Id(dialedName, dialedNumber, dialedPrivacy);
++>>>>>>> master
IdSeq dialedSeq;
dialedSeq.push_back(dialedId);
mDialed = new Dialed(dialedNumber);
NamePtr redirName = new Name("scud");
NumberPtr redirNumber = new Number("666");
++<<<<<<< HEAD
+ IdPtr connectedId = new Id(redirName, redirNumber, new Privacy(false));
++=======
+ PrivacyPtr redirPrivacy = new Privacy(false);
+ IdPtr connectedId = new Id(redirName, redirNumber, redirPrivacy);
++>>>>>>> master
IdSeq idSeq2;
idSeq2.push_back(connectedId);
mConnectedLine = new ConnectedLine(idSeq2);
RedirectionSeq redirects;
++<<<<<<< HEAD
+ RedirectionPtr redirect = new Redirection(dialedId, connectedId,
+ new RedirectionReason(Unavailable));
++=======
+ RedirectionReasonPtr reason = new RedirectionReason(AsteriskSCF::SessionCommunications::PartyIdentification::V1::Unknown);
+ RedirectionPtr redirect = new Redirection(dialedId, connectedId, reason);
++>>>>>>> master
redirects.push_back(redirect);
mRedirections = new Redirections(redirects);
commit db6f6d2229821b9d2382fcd80870979e081e4b0a
Author: Brent Eagles <beagles at digium.com>
Date: Mon Jan 9 16:45:04 2012 -0330
Fix enum name ambiguity build issue.
diff --git a/src/TestEndpoint.cpp b/src/TestEndpoint.cpp
index 5c9c7bc..a8996c8 100644
--- a/src/TestEndpoint.cpp
+++ b/src/TestEndpoint.cpp
@@ -256,7 +256,7 @@ public:
mConnectedLine = new ConnectedLine(idSeq2);
RedirectionSeq redirects;
- RedirectionReasonPtr reason = new RedirectionReason(Unknown);
+ RedirectionReasonPtr reason = new RedirectionReason(AsteriskSCF::SessionCommunications::PartyIdentification::V1::Unknown);
RedirectionPtr redirect = new Redirection(dialedId, connectedId, reason);
redirects.push_back(redirect);
mRedirections = new Redirections(redirects);
commit 7b1b2d7e9ca1ab56e2080fca98c76f020c4a3b36
Author: Mark Michelson <mmichelson at digium.com>
Date: Tue Jan 3 14:37:43 2012 -0600
Adjust component library names and update test config files
diff --git a/config/test_channel.conf b/config/test_channel.conf
index a87c7c6..37d55e1 100644
--- a/config/test_channel.conf
+++ b/config/test_channel.conf
@@ -18,9 +18,9 @@ LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 55557
TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 55555
-IceBox.Service.Logger=logging-service:createLoggingService
-IceBox.Service.TestServiceLocator=service_locator:create
-IceBox.Service.TestChannel=test_channel:create
+IceBox.Service.Logger=LoggingService:createLoggingService
+IceBox.Service.TestServiceLocator=ServiceLocator:create
+IceBox.Service.TestChannel=TestChannel:create
IceBox.LoadOrder=Logger TestServiceLocator TestChannel
IceBox.ServiceManager.Endpoints=default -p 56000
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f8ae737..57e4eaf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,28 +3,28 @@ include_directories(${logger_dir}/include)
astscf_slice_include_collection(TEST_CHANNEL)
-astscf_component_init(test_channel)
-astscf_component_add_files(test_channel Service.cpp)
-astscf_component_add_files(test_channel MediaEchoThread.cpp)
-astscf_component_add_files(test_channel MediaEchoThread.h)
-astscf_component_add_files(test_channel MediaSession.cpp)
-astscf_component_add_files(test_channel MediaSession.h)
-astscf_component_add_files(test_channel TestEndpoint.cpp)
-astscf_component_add_files(test_channel TestEndpoint.h)
-astscf_component_add_files(test_channel Logger.h)
-astscf_component_add_files(test_channel ListenerManager.h)
-astscf_component_add_files(test_channel InternalExceptions.h)
-astscf_component_add_ice_libraries(test_channel IceStorm)
-astscf_component_add_boost_libraries(test_channel thread date_time)
-astscf_component_add_slice_collection_libraries(test_channel ASTSCF TEST_CHANNEL)
-astscf_component_build_icebox(test_channel)
-target_link_libraries(test_channel LoggingClient)
-astscf_component_install(test_channel)
+astscf_component_init(TestChannel)
+astscf_component_add_files(TestChannel Service.cpp)
+astscf_component_add_files(TestChannel MediaEchoThread.cpp)
+astscf_component_add_files(TestChannel MediaEchoThread.h)
+astscf_component_add_files(TestChannel MediaSession.cpp)
+astscf_component_add_files(TestChannel MediaSession.h)
+astscf_component_add_files(TestChannel TestEndpoint.cpp)
+astscf_component_add_files(TestChannel TestEndpoint.h)
+astscf_component_add_files(TestChannel Logger.h)
+astscf_component_add_files(TestChannel ListenerManager.h)
+astscf_component_add_files(TestChannel InternalExceptions.h)
+astscf_component_add_ice_libraries(TestChannel IceStorm)
+astscf_component_add_boost_libraries(TestChannel thread date_time)
+astscf_component_add_slice_collection_libraries(TestChannel ASTSCF TEST_CHANNEL)
+astscf_component_build_icebox(TestChannel)
+target_link_libraries(TestChannel LoggingClient)
+astscf_component_install(TestChannel)
-astscf_component_init(console_driver)
-astscf_component_add_files(console_driver ConsoleDriver.cpp)
-astscf_component_add_files(console_driver ConsoleDriver.h)
-astscf_component_add_files(console_driver main.cpp)
-astscf_component_add_slice_collection_libraries(console_driver TEST_CHANNEL)
-astscf_component_build_standalone(console_driver)
-astscf_component_install(console_driver)
+astscf_component_init(ConsoleDriver)
+astscf_component_add_files(ConsoleDriver ConsoleDriver.cpp)
+astscf_component_add_files(ConsoleDriver ConsoleDriver.h)
+astscf_component_add_files(ConsoleDriver main.cpp)
+astscf_component_add_slice_collection_libraries(ConsoleDriver TEST_CHANNEL)
+astscf_component_build_standalone(ConsoleDriver)
+astscf_component_install(ConsoleDriver)
-----------------------------------------------------------------------
--
asterisk-scf/integration/test_channel.git
More information about the asterisk-scf-commits
mailing list