[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jan 7 21:01:27 UTC 2011
branch "master" has been updated
via 968acad3916e463eac055f832288c990fd15ef11 (commit)
from b2c1ccb92363ec8e99d295843b6529efd73e0a03 (commit)
Summary of changes:
CMakeLists.txt => AsteriskSCF/CMakeLists.txt | 0
{Core => AsteriskSCF/Core}/CMakeLists.txt | 1 +
.../Core}/Discovery/CMakeLists.txt | 0
.../Core}/Discovery/ServiceLocatorEventsIf.ice | 0
.../Core}/Discovery/ServiceLocatorIf.ice | 0
{Core => AsteriskSCF/Core}/Endpoint/CMakeLists.txt | 0
{Core => AsteriskSCF/Core}/Endpoint/EndpointIf.ice | 0
{Core => AsteriskSCF/Core}/Routing/CMakeLists.txt | 0
{Core => AsteriskSCF/Core}/Routing/RoutingIf.ice | 2 +-
{Media => AsteriskSCF/Media}/CMakeLists.txt | 0
{Media => AsteriskSCF/Media}/MediaIf.ice | 2 +-
{Media => AsteriskSCF/Media}/RTP/CMakeLists.txt | 0
{Media => AsteriskSCF/Media}/RTP/MediaRTPIf.ice | 4 ++--
.../SessionCommunications}/CMakeLists.txt | 0
.../SessionCommunicationsIf.ice | 10 +++++-----
{System => AsteriskSCF/System}/CMakeLists.txt | 0
.../System}/Component/CMakeLists.txt | 0
.../System}/Component/ComponentServiceIf.ice | 0
.../System}/Component/ReplicaIf.ice | 2 +-
{System => AsteriskSCF/System}/ExceptionsIf.ice | 0
.../System}/Logger/CMakeLists.txt | 0
{System => AsteriskSCF/System}/Logger/LoggerIf.ice | 0
{System => AsteriskSCF/System}/Time/CMakeLists.txt | 0
{System => AsteriskSCF/System}/Time/TimeIf.ice | 0
CMakeLists.txt | 11 +----------
25 files changed, 12 insertions(+), 20 deletions(-)
copy CMakeLists.txt => AsteriskSCF/CMakeLists.txt (100%)
rename {Core => AsteriskSCF/Core}/CMakeLists.txt (99%)
rename {Core => AsteriskSCF/Core}/Discovery/CMakeLists.txt (100%)
rename {Core => AsteriskSCF/Core}/Discovery/ServiceLocatorEventsIf.ice (100%)
rename {Core => AsteriskSCF/Core}/Discovery/ServiceLocatorIf.ice (100%)
rename {Core => AsteriskSCF/Core}/Endpoint/CMakeLists.txt (100%)
rename {Core => AsteriskSCF/Core}/Endpoint/EndpointIf.ice (100%)
rename {Core => AsteriskSCF/Core}/Routing/CMakeLists.txt (100%)
rename {Core => AsteriskSCF/Core}/Routing/RoutingIf.ice (99%)
rename {Media => AsteriskSCF/Media}/CMakeLists.txt (100%)
rename {Media => AsteriskSCF/Media}/MediaIf.ice (99%)
rename {Media => AsteriskSCF/Media}/RTP/CMakeLists.txt (100%)
rename {Media => AsteriskSCF/Media}/RTP/MediaRTPIf.ice (97%)
rename {SessionCommunications => AsteriskSCF/SessionCommunications}/CMakeLists.txt (100%)
rename {SessionCommunications => AsteriskSCF/SessionCommunications}/SessionCommunicationsIf.ice (98%)
rename {System => AsteriskSCF/System}/CMakeLists.txt (100%)
rename {System => AsteriskSCF/System}/Component/CMakeLists.txt (100%)
rename {System => AsteriskSCF/System}/Component/ComponentServiceIf.ice (100%)
rename {System => AsteriskSCF/System}/Component/ReplicaIf.ice (98%)
rename {System => AsteriskSCF/System}/ExceptionsIf.ice (100%)
rename {System => AsteriskSCF/System}/Logger/CMakeLists.txt (100%)
rename {System => AsteriskSCF/System}/Logger/LoggerIf.ice (100%)
rename {System => AsteriskSCF/System}/Time/CMakeLists.txt (100%)
rename {System => AsteriskSCF/System}/Time/TimeIf.ice (100%)
- Log -----------------------------------------------------------------
commit 968acad3916e463eac055f832288c990fd15ef11
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Jan 7 15:00:40 2011 -0600
Adjust #includes to use <> and prefix paths with AsteriskSCF.
diff --git a/CMakeLists.txt b/AsteriskSCF/CMakeLists.txt
similarity index 100%
copy from CMakeLists.txt
copy to AsteriskSCF/CMakeLists.txt
diff --git a/Core/CMakeLists.txt b/AsteriskSCF/Core/CMakeLists.txt
similarity index 99%
rename from Core/CMakeLists.txt
rename to AsteriskSCF/Core/CMakeLists.txt
index 710a8b9..fd4994c 100644
--- a/Core/CMakeLists.txt
+++ b/AsteriskSCF/Core/CMakeLists.txt
@@ -6,3 +6,4 @@ add_subdirectory(Endpoint)
# Slice definitions for Routing functionality
add_subdirectory(Routing)
+
diff --git a/Core/Discovery/CMakeLists.txt b/AsteriskSCF/Core/Discovery/CMakeLists.txt
similarity index 100%
rename from Core/Discovery/CMakeLists.txt
rename to AsteriskSCF/Core/Discovery/CMakeLists.txt
diff --git a/Core/Discovery/ServiceLocatorEventsIf.ice b/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
similarity index 100%
rename from Core/Discovery/ServiceLocatorEventsIf.ice
rename to AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
diff --git a/Core/Discovery/ServiceLocatorIf.ice b/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
similarity index 100%
rename from Core/Discovery/ServiceLocatorIf.ice
rename to AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
diff --git a/Core/Endpoint/CMakeLists.txt b/AsteriskSCF/Core/Endpoint/CMakeLists.txt
similarity index 100%
rename from Core/Endpoint/CMakeLists.txt
rename to AsteriskSCF/Core/Endpoint/CMakeLists.txt
diff --git a/Core/Endpoint/EndpointIf.ice b/AsteriskSCF/Core/Endpoint/EndpointIf.ice
similarity index 100%
rename from Core/Endpoint/EndpointIf.ice
rename to AsteriskSCF/Core/Endpoint/EndpointIf.ice
diff --git a/Core/Routing/CMakeLists.txt b/AsteriskSCF/Core/Routing/CMakeLists.txt
similarity index 100%
rename from Core/Routing/CMakeLists.txt
rename to AsteriskSCF/Core/Routing/CMakeLists.txt
diff --git a/Core/Routing/RoutingIf.ice b/AsteriskSCF/Core/Routing/RoutingIf.ice
similarity index 99%
rename from Core/Routing/RoutingIf.ice
rename to AsteriskSCF/Core/Routing/RoutingIf.ice
index d4edf9c..4dc6993 100644
--- a/Core/Routing/RoutingIf.ice
+++ b/AsteriskSCF/Core/Routing/RoutingIf.ice
@@ -16,7 +16,7 @@
#pragma once
-#include <Core/Endpoint/EndpointIf.ice>
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.ice>
module AsteriskSCF
{
diff --git a/Media/CMakeLists.txt b/AsteriskSCF/Media/CMakeLists.txt
similarity index 100%
rename from Media/CMakeLists.txt
rename to AsteriskSCF/Media/CMakeLists.txt
diff --git a/Media/MediaIf.ice b/AsteriskSCF/Media/MediaIf.ice
similarity index 99%
rename from Media/MediaIf.ice
rename to AsteriskSCF/Media/MediaIf.ice
index efcc982..59e1846 100644
--- a/Media/MediaIf.ice
+++ b/AsteriskSCF/Media/MediaIf.ice
@@ -17,7 +17,7 @@
#pragma once
#include <Ice/BuiltinSequences.ice>
-#include <Core/Discovery/ServiceLocatorIf.ice>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice>
module AsteriskSCF
{
diff --git a/Media/RTP/CMakeLists.txt b/AsteriskSCF/Media/RTP/CMakeLists.txt
similarity index 100%
rename from Media/RTP/CMakeLists.txt
rename to AsteriskSCF/Media/RTP/CMakeLists.txt
diff --git a/Media/RTP/MediaRTPIf.ice b/AsteriskSCF/Media/RTP/MediaRTPIf.ice
similarity index 97%
rename from Media/RTP/MediaRTPIf.ice
rename to AsteriskSCF/Media/RTP/MediaRTPIf.ice
index 816dfc6..3bad522 100644
--- a/Media/RTP/MediaRTPIf.ice
+++ b/AsteriskSCF/Media/RTP/MediaRTPIf.ice
@@ -14,8 +14,8 @@
* at the top of the source tree.
*/
-#include <Core/Discovery/ServiceLocatorIf.ice>
-#include <Media/MediaIf.ice>
+#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice>
+#include <AsteriskSCF/Media/MediaIf.ice>
module AsteriskSCF
{
diff --git a/SessionCommunications/CMakeLists.txt b/AsteriskSCF/SessionCommunications/CMakeLists.txt
similarity index 100%
rename from SessionCommunications/CMakeLists.txt
rename to AsteriskSCF/SessionCommunications/CMakeLists.txt
diff --git a/SessionCommunications/SessionCommunicationsIf.ice b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
similarity index 98%
rename from SessionCommunications/SessionCommunicationsIf.ice
rename to AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 92a7642..614479c 100644
--- a/SessionCommunications/SessionCommunicationsIf.ice
+++ b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -16,11 +16,11 @@
#pragma once
-#include <Core/Endpoint/EndpointIf.ice>
-#include <Core/Routing/RoutingIf.ice>
-#include <System/Component/ComponentServiceIf.ice>
-#include <System/Time/TimeIf.ice>
-#include <Media/MediaIf.ice>
+#include <AsteriskSCF/Core/Endpoint/EndpointIf.ice>
+#include <AsteriskSCF/Core/Routing/RoutingIf.ice>
+#include <AsteriskSCF/System/Component/ComponentServiceIf.ice>
+#include <AsteriskSCF/System/Time/TimeIf.ice>
+#include <AsteriskSCF/Media/MediaIf.ice>
module AsteriskSCF
{
diff --git a/System/CMakeLists.txt b/AsteriskSCF/System/CMakeLists.txt
similarity index 100%
rename from System/CMakeLists.txt
rename to AsteriskSCF/System/CMakeLists.txt
diff --git a/System/Component/CMakeLists.txt b/AsteriskSCF/System/Component/CMakeLists.txt
similarity index 100%
rename from System/Component/CMakeLists.txt
rename to AsteriskSCF/System/Component/CMakeLists.txt
diff --git a/System/Component/ComponentServiceIf.ice b/AsteriskSCF/System/Component/ComponentServiceIf.ice
similarity index 100%
rename from System/Component/ComponentServiceIf.ice
rename to AsteriskSCF/System/Component/ComponentServiceIf.ice
diff --git a/System/Component/ReplicaIf.ice b/AsteriskSCF/System/Component/ReplicaIf.ice
similarity index 98%
rename from System/Component/ReplicaIf.ice
rename to AsteriskSCF/System/Component/ReplicaIf.ice
index 6151454..4164b7a 100644
--- a/System/Component/ReplicaIf.ice
+++ b/AsteriskSCF/System/Component/ReplicaIf.ice
@@ -16,7 +16,7 @@
#pragma once
-#include <System/Component/ComponentServiceIf.ice>
+#include <AsteriskSCF/System/Component/ComponentServiceIf.ice>
module AsteriskSCF
{
diff --git a/System/ExceptionsIf.ice b/AsteriskSCF/System/ExceptionsIf.ice
similarity index 100%
rename from System/ExceptionsIf.ice
rename to AsteriskSCF/System/ExceptionsIf.ice
diff --git a/System/Logger/CMakeLists.txt b/AsteriskSCF/System/Logger/CMakeLists.txt
similarity index 100%
rename from System/Logger/CMakeLists.txt
rename to AsteriskSCF/System/Logger/CMakeLists.txt
diff --git a/System/Logger/LoggerIf.ice b/AsteriskSCF/System/Logger/LoggerIf.ice
similarity index 100%
rename from System/Logger/LoggerIf.ice
rename to AsteriskSCF/System/Logger/LoggerIf.ice
diff --git a/System/Time/CMakeLists.txt b/AsteriskSCF/System/Time/CMakeLists.txt
similarity index 100%
rename from System/Time/CMakeLists.txt
rename to AsteriskSCF/System/Time/CMakeLists.txt
diff --git a/System/Time/TimeIf.ice b/AsteriskSCF/System/Time/TimeIf.ice
similarity index 100%
rename from System/Time/TimeIf.ice
rename to AsteriskSCF/System/Time/TimeIf.ice
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfa7f97..8049668 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,13 +10,4 @@
asterisk_scf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
# Slice definitions for system infrastructure
-add_subdirectory(System)
-
-# Slice definitions for core functionality
-add_subdirectory(Core)
-
-# Slice definitions for media functionality
-add_subdirectory(Media)
-
-# Slice definitions for session-oriented communications
-add_subdirectory(SessionCommunications)
+add_subdirectory(AsteriskSCF)
\ No newline at end of file
-----------------------------------------------------------------------
--
asterisk-scf/release/slice.git
More information about the asterisk-scf-commits
mailing list