[asterisk-scf-commits] asterisk-scf/release/logger.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  a2ef5be7590e92ec6d5cca469870e69cbb198ab1 (commit)
       via  bbeb4e4638e5cb7015edf3a562cec931c29c57b5 (commit)
       via  a1cff001559a5d44c023bff5cf36e7caf593217f (commit)
      from  14a960b9f78176b4722faa589cb7687718ba1c74 (commit)

Summary of changes:
 CMakeLists.txt                          |    5 ++---
 client/test/CMakeLists.txt              |    2 +-
 server/CMakeLists.txt                   |    1 -
 server/config/CMakeLists.txt            |    9 ---------
 server/config/testloggingserver.conf    |   11 +++++++++++
 server/config/testloggingserver.conf.in |   11 -----------
 server/test/CMakeLists.txt              |    4 ++--
 7 files changed, 16 insertions(+), 27 deletions(-)
 delete mode 100644 server/config/CMakeLists.txt
 create mode 100644 server/config/testloggingserver.conf
 delete mode 100644 server/config/testloggingserver.conf.in


- Log -----------------------------------------------------------------
commit a2ef5be7590e92ec6d5cca469870e69cbb198ab1
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Apr 26 11:43:32 2011 -0500

    Remove configuration of file that does not need it now.

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 61e6803..6b2ef65 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -8,4 +8,3 @@
 
 add_subdirectory(src)
 add_subdirectory(test)
-add_subdirectory(config)
diff --git a/server/config/CMakeLists.txt b/server/config/CMakeLists.txt
deleted file mode 100644
index 2497637..0000000
--- a/server/config/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Asterisk Scalable Communications Framework
-#
-# Copyright (C) 2010 -- Digium, Inc.
-#
-# All rights reserved.
-#
-
-configure_file(testloggingserver.conf.in testloggingserver.conf)

commit bbeb4e4638e5cb7015edf3a562cec931c29c57b5
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Apr 26 11:37:18 2011 -0500

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

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

commit a1cff001559a5d44c023bff5cf36e7caf593217f
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Apr 25 17:48:44 2011 -0500

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c055ab..4bb39ef 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("Logger" 3.4 CXX)
-
     # Take care of slice definitions
     add_subdirectory(slice)
 else()
@@ -26,6 +23,8 @@ else()
     set(logger_bindir ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
 endif()
 
+asterisk_scf_project(Logger 3.4)
+
 add_subdirectory(server)
 add_subdirectory(client) # For the client test directory.
 
diff --git a/client/test/CMakeLists.txt b/client/test/CMakeLists.txt
index 57160f2..b7ede84 100644
--- a/client/test/CMakeLists.txt
+++ b/client/test/CMakeLists.txt
@@ -24,7 +24,7 @@ asterisk_scf_component_build_standalone(logging-client-test)
 target_link_libraries(logging-client-test logging-client)
 target_link_libraries(logging-client-test asterisk-scf-api)
 
-boost_add_test(logging-client-test)
+asterisk_scf_test_boost(logging-client-test)
 
 asterisk_scf_component_init(scf-log CXX)
 
diff --git a/server/config/testloggingserver.conf.in b/server/config/testloggingserver.conf.in
index 985e254..1c3d132 100644
--- a/server/config/testloggingserver.conf.in
+++ b/server/config/testloggingserver.conf.in
@@ -1,11 +1,11 @@
-IceBox.InheritProperties = 1
+IceBox.InheritProperties=1
 
-IceBox.Service.Logger =../src at logging-service:createLoggingService
-IceBox.Service.LoggerTest = ../test at LoggingConfigurationTest:create
+IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.LoggerTest=LoggingConfigurationTest:create
 
 IceBox.LoadOrder=Logger,LoggerTest
 
-AsteriskSCF.LoggingService.Endpoints = tcp -p 31337
+AsteriskSCF.LoggingService.Endpoints=tcp -p 31337
 Logger.Proxy=LoggerConfigurationService:tcp -p 31337
 
-LoggerTestAdapter.Endpoints = default
+LoggerTestAdapter.Endpoints=default
diff --git a/server/test/CMakeLists.txt b/server/test/CMakeLists.txt
index 01fd304..e22d564 100644
--- a/server/test/CMakeLists.txt
+++ b/server/test/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(logging-service-test asterisk-scf-api)
 
 target_link_libraries(logging-service-test logging-service-lib)
 
-boost_add_test(logging-service-test)
+asterisk_scf_test_boost(logging-service-test)
 
 asterisk_scf_component_init(LoggingConfigurationTest CXX)
 
@@ -38,5 +38,5 @@ asterisk_scf_component_build_icebox(LoggingConfigurationTest)
 target_link_libraries(LoggingConfigurationTest asterisk-scf-api)
 
 if(integrated_build STREQUAL "true")
-   icebox_add_test(LoggingConfigurationTest ../config/testloggingserver.conf)
+   asterisk_scf_test_icebox(LoggingConfigurationTest server/config/testloggingserver.conf)
 endif()

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


-- 
asterisk-scf/release/logger.git