[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "single-build-dir" updated.

[Commits to the Asterisk SCF project code repositories]

branch "single-build-dir" has been updated
  discards  247d3585bd13d852d02c8699df353d6f0ec92fda (commit)
  discards  858c1b9af86d3e4be1848bb30a7dd84580a7c12f (commit)
  discards  4de045a1b56c078a7fb73cf95f6a38370ee531d4 (commit)
       via  d922b0a5315b0abe2e9cb10d774870d4e7bd2f11 (commit)
       via  9cd5f73e81340ea9589d8736f61ba4ef4b1c2dc7 (commit)
       via  13d1259e05de64a80bbafb66f94f4938595bc517 (commit)
       via  57b2e61bdf648e629cb2964e34f74621c399a94b (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (247d3585bd13d852d02c8699df353d6f0ec92fda)
            \
             N -- N -- N (d922b0a5315b0abe2e9cb10d774870d4e7bd2f11)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Summary of changes:
 config/test_bridging.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


- Log -----------------------------------------------------------------
commit d922b0a5315b0abe2e9cb10d774870d4e7bd2f11
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Apr 26 11:42:58 2011 -0500

    Remove configuration of file that does not need it now.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8432c0..5483175 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,5 +27,4 @@ endif()
 asterisk_scf_project(BridgingService 3.4)
 
 add_subdirectory(src)
-add_subdirectory(config)
 add_subdirectory(test)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
deleted file mode 100644
index df5843f..0000000
--- a/config/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-configure_file(test_bridging.conf.in test_bridging.conf)

commit 9cd5f73e81340ea9589d8736f61ba4ef4b1c2dc7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Apr 26 11:36:42 2011 -0500

    Rename a config file that was missed in the previous round of changes.

diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf
similarity index 100%
rename from config/test_bridging.conf.in
rename to config/test_bridging.conf

commit 13d1259e05de64a80bbafb66f94f4938595bc517
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Apr 25 17:49:26 2011 -0500

    Changes to work with new single-build-directory CMake script.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9979a32..e8432c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ if(NOT integrated_build STREQUAL "true")
    # Include common AsteriskSCF build infrastructure
    include(cmake/AsteriskSCF.cmake)
 
-   # This project is C++ based and requires a minimum of 3.4
-   asterisk_scf_project(BridgingService 3.4 CXX)
-
    # Take care of slice definitions
    add_subdirectory(slice)
 
@@ -27,6 +24,8 @@ if(NOT integrated_build STREQUAL "true")
    add_subdirectory(logger)
 endif()
 
+asterisk_scf_project(BridgingService 3.4)
+
 add_subdirectory(src)
 add_subdirectory(config)
 add_subdirectory(test)
diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf.in
index 3e5f3ab..e88f751 100644
--- a/config/test_bridging.conf.in
+++ b/config/test_bridging.conf.in
@@ -109,13 +109,13 @@ ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422
 #
 # The IceBox entries for loading the services.
 #
-IceBox.Service.Logger=${logger_bindir}/server/src at logging-service:createLoggingService
-IceBox.Service.Replicator=../src at BridgeReplicator:create
-IceBox.Service.TestBridge=../src at bridgeservice:create
-IceBox.Service.TestBridge2=../src/@bridgeservice:create
-IceBox.Service.TestServiceLocator=${service_locator_bindir}/src at service_locator:create
-IceBox.Service.TestChannel=${test_channel_bindir}/src at test_channel:create
-IceBox.Service.TestDriver=../test at bridge_component_test:create
+IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.Replicator=BridgeReplicator:create
+IceBox.Service.TestBridge=bridgeservice:create
+IceBox.Service.TestBridge2=bridgeservice:create
+IceBox.Service.TestServiceLocator=service_locator:create
+IceBox.Service.TestChannel=test_channel:create
+IceBox.Service.TestDriver=bridge_component_test:create
 
 #
 # The bridging service uses the test channel`s Endpoint
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2dfcc0e..b74c1e9 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -34,7 +34,7 @@ target_link_libraries(bridge_component_test test-channel-api)
 
 # component tests only work for integrated builds
 if(integrated_build STREQUAL "true")
-  icebox_add_test(bridge_component_test ../config/test_bridging.conf)
+  asterisk_scf_test_icebox(bridge_component_test config/test_bridging.conf)
 endif()
 
 asterisk_scf_component_init(bridge_unit_tests CXX)

commit 57b2e61bdf648e629cb2964e34f74621c399a94b
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Apr 26 14:32:57 2011 -0230

    Add missing service locator configuration.

diff --git a/config/test_bridging.conf.in b/config/test_bridging.conf.in
index 37d7b8c..3e5f3ab 100644
--- a/config/test_bridging.conf.in
+++ b/config/test_bridging.conf.in
@@ -98,6 +98,7 @@ ServiceLocatorAdapter.Endpoints=tcp -p 4411
 ServiceLocatorAdapter.ThreadPool.Size=4
 ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
 ServiceLocatorManagementAdapter.ThreadPool.Size=4
+ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
 
 #
 # The proxies that clients use to access the Service Locator facilities.

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/bridging.git