[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "master" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Tue Sep 14 14:44:55 CDT 2010


branch "master" has been updated
       via  8400eee14f05c8224e398d3085e46b0474a9c79f (commit)
       via  d293d35af7a13eb1f92e77700712b83f38b2acfc (commit)
       via  c1c7b101ef84a8024611934c79a6def72245198b (commit)
      from  5f358adef20d34e424d8f3223ce07e5aacffcef3 (commit)

Summary of changes:
 .gitmodules                      |    2 +-
 src/BridgeImpl.cpp               |    7 +++++++
 src/BridgeManagerImpl.cpp        |    7 +++++++
 src/BridgeManagerImpl.h          |    7 +++++++
 src/BridgeServiceImpl.h          |    7 +++++++
 src/InternalExceptions.h         |    7 +++++++
 src/ListenerManager.h            |    7 +++++++
 src/Logger.h                     |    7 +++++++
 src/MediaSplicer.cpp             |    7 +++++++
 src/MediaSplicer.h               |    7 +++++++
 src/Service.cpp                  |    7 +++++++
 test/BridgeManagerListenerI.cpp  |    7 +++++++
 test/BridgeTestChannelDriver.cpp |    7 +++++++
 test/BridgeTestChannelDriver.h   |    7 +++++++
 test/channel_driver              |    2 +-
 15 files changed, 93 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 8400eee14f05c8224e398d3085e46b0474a9c79f
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Sep 14 14:41:22 2010 -0500

    Add copyright/license headers where needed.

diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 6ef3af9..7f33680 100644
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #include "BridgeImpl.h"
 #include <System/Component/ComponentServiceIf.h>
 #include <SessionCommunications/SessionCommunicationsIf.h>
diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index 812dfb5..270ec95 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #include "BridgeManagerImpl.h"
 #include <Ice/Ice.h>
 #include <IceUtil/UUID.h>
diff --git a/src/BridgeManagerImpl.h b/src/BridgeManagerImpl.h
index 80c657f..ca8d90d 100644
--- a/src/BridgeManagerImpl.h
+++ b/src/BridgeManagerImpl.h
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #pragma once
 
 #include <SessionCommunications/SessionCommunicationsIf.h>
diff --git a/src/BridgeServiceImpl.h b/src/BridgeServiceImpl.h
index 12aa7e6..7356f60 100644
--- a/src/BridgeServiceImpl.h
+++ b/src/BridgeServiceImpl.h
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #pragma once
 #ifndef __HYDRA_BRIDGE_SERVICE_IMPL_H
 #define __HYDRA_BRIDGE_SERVICE_IMPL_H
diff --git a/src/InternalExceptions.h b/src/InternalExceptions.h
index 13c5d43..2eca5cd 100644
--- a/src/InternalExceptions.h
+++ b/src/InternalExceptions.h
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #pragma once
 
 #include <exception>
diff --git a/src/ListenerManager.h b/src/ListenerManager.h
index 17ac0ea..759fb3f 100644
--- a/src/ListenerManager.h
+++ b/src/ListenerManager.h
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #pragma once
 
 #include <Ice/Ice.h>
diff --git a/src/Logger.h b/src/Logger.h
index 8460479..cd363d2 100644
--- a/src/Logger.h
+++ b/src/Logger.h
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #pragma once
 
 #include <iostream>
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 3d080b7..95ac18c 100644
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #include "MediaSplicer.h"
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
diff --git a/src/MediaSplicer.h b/src/MediaSplicer.h
index ff1b905..ac7276c 100644
--- a/src/MediaSplicer.h
+++ b/src/MediaSplicer.h
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #pragma once
 
 #include <IceUtil/Shared.h>
diff --git a/src/Service.cpp b/src/Service.cpp
index f10f825..bff6be5 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #include "BridgeManagerImpl.h"
 #include "Logger.h"
 
diff --git a/test/BridgeManagerListenerI.cpp b/test/BridgeManagerListenerI.cpp
index 0c33a89..e88f404 100644
--- a/test/BridgeManagerListenerI.cpp
+++ b/test/BridgeManagerListenerI.cpp
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #include "BridgeManagerListenerI.h"
 
 BridgeManagerListenerI::BridgeManagerListenerI() :
diff --git a/test/BridgeTestChannelDriver.cpp b/test/BridgeTestChannelDriver.cpp
index 14f3e1e..affd18d 100644
--- a/test/BridgeTestChannelDriver.cpp
+++ b/test/BridgeTestChannelDriver.cpp
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 
 BridgeTestChannelDriver::setHandler(const CommandsPtr& cmd)
 {
diff --git a/test/BridgeTestChannelDriver.h b/test/BridgeTestChannelDriver.h
index 413d1eb..272ab21 100644
--- a/test/BridgeTestChannelDriver.h
+++ b/test/BridgeTestChannelDriver.h
@@ -1,3 +1,10 @@
+/*
+ * Asterisk Scalable Communications Framework
+ *
+ * Copyright (C) 2010 -- Digium, Inc.
+ *
+ * All rights reserved.
+ */
 #pragma once
 
 #include <Commands.h>

commit d293d35af7a13eb1f92e77700712b83f38b2acfc
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Sep 14 14:40:52 2010 -0500

    use a relative path instead of a full URI

diff --git a/.gitmodules b/.gitmodules
index 81540dd..7e7b888 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,4 +6,4 @@
 	url = ../../release/cmake
 [submodule "test/channel_driver"]
 	path = test/channel_driver
-	url = ssh://git@git.asterisk.org/asterisk-scf/integration/test_channel
+	url = ../../integration/test_channel

commit c1c7b101ef84a8024611934c79a6def72245198b
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Tue Sep 14 14:40:26 2010 -0500

    update to latest commit in test_channel repo

diff --git a/test/channel_driver b/test/channel_driver
index 28bc741..322c025 160000
--- a/test/channel_driver
+++ b/test/channel_driver
@@ -1 +1 @@
-Subproject commit 28bc7415c6aefffee7f9cb21ef9a05f38d52af4b
+Subproject commit 322c0254039000c9388bb93db8dad1130208922f

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


-- 
asterisk-scf/integration/bridging.git



More information about the asterisk-scf-commits mailing list