[asterisk-scf-commits] asterisk-scf/integration/servicediscovery.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Aug 31 10:37:21 CDT 2010
branch "master" has been updated
via 5914ee2d69889eaf020af1fc07062288f218ff38 (commit)
via 50fcdbff693d5287c2c0a77e019b6b07c12c9000 (commit)
from ed83ebf85a0a6e3c258377d920c19a298829d92c (commit)
Summary of changes:
CMakeLists.txt | 8 ++++++++
src/CMakeLists.txt | 8 ++++++++
src/ServiceLocator.cpp | 16 +++-------------
src/ServiceLocatorManagement.cpp | 16 +++-------------
src/ServiceLocatorManagement.h | 16 +++-------------
src/ServiceManagement.cpp | 16 +++-------------
src/ServiceManagement.h | 16 +++-------------
test/CMakeLists.txt | 8 ++++++++
test/TestServiceLocator.cpp | 8 ++++++++
9 files changed, 47 insertions(+), 65 deletions(-)
- Log -----------------------------------------------------------------
commit 5914ee2d69889eaf020af1fc07062288f218ff38
Merge: 50fcdbf ed83ebf
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Aug 31 12:47:12 2010 -0300
Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/servicediscovery
commit 50fcdbff693d5287c2c0a77e019b6b07c12c9000
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Aug 31 12:46:40 2010 -0300
Update with new copyright/license/stuff.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cbf688..4b9dcfc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,11 @@
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
# Service locator build system
# Minimum we require is 2.6, any lower and stuff would fail horribly
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7e5c966..f1d74e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,11 @@
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
# Create the actual standalone service locator component
hydra_component_init(service_locator CXX)
hydra_component_add_slice(service_locator ServiceLocatorIf)
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index 4db5579..81755d7 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -1,19 +1,9 @@
/*
- * TBD -- An open source telephony framework.
+ * Asterisk Scalable Communications Framework
*
- * Copyright (C) 2010, Digium, Inc.
+ * Copyright (C) 2010 -- Digium, Inc.
*
- * Joshua Colp <jcolp at digium.com>
- *
- * See TBD for more information about
- * the TBD project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
+ * All rights reserved.
*/
#include <Ice/Ice.h>
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index b332a12..c835d51 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -1,19 +1,9 @@
/*
- * TBD -- An open source telephony framework.
+ * Asterisk Scalable Communications Framework
*
- * Copyright (C) 2010, Digium, Inc.
+ * Copyright (C) 2010 -- Digium, Inc.
*
- * Joshua Colp <jcolp at digium.com>
- *
- * See TBD for more information about
- * the TBD project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
+ * All rights reserved.
*/
#include <Ice/Ice.h>
diff --git a/src/ServiceLocatorManagement.h b/src/ServiceLocatorManagement.h
index 118bc4c..26ca380 100644
--- a/src/ServiceLocatorManagement.h
+++ b/src/ServiceLocatorManagement.h
@@ -1,19 +1,9 @@
/*
- * TBD -- An open source telephony framework.
+ * Asterisk Scalable Communications Framework
*
- * Copyright (C) 2010, Digium, Inc.
+ * Copyright (C) 2010 -- Digium, Inc.
*
- * Joshua Colp <jcolp at digium.com>
- *
- * See TBD for more information about
- * the TBD project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
+ * All rights reserved.
*/
#pragma once
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index 3938387..565782f 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -1,19 +1,9 @@
/*
- * TBD -- An open source telephony framework.
+ * Asterisk Scalable Communications Framework
*
- * Copyright (C) 2010, Digium, Inc.
+ * Copyright (C) 2010 -- Digium, Inc.
*
- * Joshua Colp <jcolp at digium.com>
- *
- * See TBD for more information about
- * the TBD project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
+ * All rights reserved.
*/
#include <Ice/Ice.h>
diff --git a/src/ServiceManagement.h b/src/ServiceManagement.h
index 3f04a76..efd0d0f 100644
--- a/src/ServiceManagement.h
+++ b/src/ServiceManagement.h
@@ -1,19 +1,9 @@
/*
- * TBD -- An open source telephony framework.
+ * Asterisk Scalable Communications Framework
*
- * Copyright (C) 2010, Digium, Inc.
+ * Copyright (C) 2010 -- Digium, Inc.
*
- * Joshua Colp <jcolp at digium.com>
- *
- * See TBD for more information about
- * the TBD project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2. See the LICENSE file
- * at the top of the source tree.
+ * All rights reserved.
*/
#pragma once
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c0665cd..7038c2d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,3 +1,11 @@
+#
+# Asterisk Scalable Communications Framework
+#
+# Copyright (C) 2010 -- Digium, Inc.
+#
+# All rights reserved.
+#
+
# Create the actual standalone service locator test driver component
hydra_component_init(service_locator_test CXX)
hydra_component_add_slice(service_locator_test ServiceLocatorIf)
diff --git a/test/TestServiceLocator.cpp b/test/TestServiceLocator.cpp
index fccdc63..eafccb3 100644
--- a/test/TestServiceLocator.cpp
+++ b/test/TestServiceLocator.cpp
@@ -1,3 +1,11 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
+
#define BOOST_TEST_DYN_LINK
#define BOOST_TEST_MODULE ServiceLocatorTestSuite
#define BOOST_TEST_NO_MAIN
-----------------------------------------------------------------------
--
asterisk-scf/integration/servicediscovery.git
More information about the asterisk-scf-commits
mailing list