[hydra-commits] hydra/team/ken.hunt/routing.git branch "master" updated.
Commits to the Hydra project code repositories
hydra-commits at lists.digium.com
Thu Aug 5 19:09:05 CDT 2010
branch "master" has been updated
via 1bfea880c7a1bfd84a29d728ce7b6de6aa2330db (commit)
via 1491114e78e2611288c1edbc94c32f0df563ff43 (commit)
from 2b07d7100d329d837e4aa143c7239745f1d41734 (commit)
Summary of changes:
.gitmodules | 6 +++
CMakeLists.txt | 19 ++++++++++
cmake | 1 +
slice | 1 +
slice/Channel/ChannelServiceIf.ice | 30 ----------------
slice/Channel/EndpointIf.ice | 19 ----------
slice/Channel/SignalIf.ice | 36 -------------------
slice/Event/EventIf.ice | 16 ---------
slice/Routing/RoutingServiceIf.ice | 66 ------------------------------------
slice/ServiceIf.ice | 13 -------
src/BasicRoutingService.cpp | 6 +++
src/CMakeLists.txt | 8 ++++
12 files changed, 41 insertions(+), 180 deletions(-)
create mode 100644 .gitmodules
create mode 100644 CMakeLists.txt
create mode 160000 cmake
create mode 160000 slice
delete mode 100644 slice/Channel/ChannelServiceIf.ice
delete mode 100644 slice/Channel/EndpointIf.ice
delete mode 100644 slice/Channel/SignalIf.ice
delete mode 100644 slice/Event/EventIf.ice
delete mode 100644 slice/Routing/RoutingServiceIf.ice
delete mode 100644 slice/ServiceIf.ice
create mode 100644 src/BasicRoutingService.cpp
create mode 100644 src/CMakeLists.txt
- Log -----------------------------------------------------------------
commit 1bfea880c7a1bfd84a29d728ce7b6de6aa2330db
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Aug 5 19:08:27 2010 -0500
Minor changes.
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a40c526
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "slice"]
+ path = slice
+ url = git at gitdepot:hydra/slice
+[submodule "cmake"]
+ path = cmake
+ url = git at gitdepot:hydra/cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..9c83d1b
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Routing Service build system
+
+# Minimum we require is 2.6
+cmake_minimum_required(VERSION 2.6)
+
+# Include common Hydra build infrastructure. Make sure your submodules are pulled.
+include(cmake/Hydra_v4.cmake)
+
+# This project is C++ based and requires a minimum of 3.4 of Ice.
+hydra_project(RoutingService 3.4 CXX)
+
+# Take care of slice definitions
+add_subdirectory(slice)
+
+# Take care of the source code for this project
+add_subdirectory(src)
+
+# Finally take care of the test suite
+#add_subdirectory(test)
diff --git a/cmake b/cmake
new file mode 160000
index 0000000..6f93993
--- /dev/null
+++ b/cmake
@@ -0,0 +1 @@
+Subproject commit 6f939932a3c35300208434795e42f5edae14e259
diff --git a/slice b/slice
new file mode 160000
index 0000000..5c46b79
--- /dev/null
+++ b/slice
@@ -0,0 +1 @@
+Subproject commit 5c46b79112a585e54925e1913bfe61f9945fa520
diff --git a/src/BasicRoutingService.cpp b/src/BasicRoutingService.cpp
new file mode 100644
index 0000000..a708dd7
--- /dev/null
+++ b/src/BasicRoutingService.cpp
@@ -0,0 +1,6 @@
+#include <Ice/Ice.h>
+#include <IceBox/IceBox.h>
+#include <IceStorm/IceStorm.h>
+
+#include "RoutingI.h"
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..c5e5dee
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Create the actual standalone basic routing component
+hydra_component_init(BasicRoutingService CXX)
+hydra_component_add_slice(BasicRoutingService RoutingI)
+hydra_component_add_file(BasicRoutingService BasicRoutingService.cpp)
+hydra_component_add_ice_libraries(BasicRoutingService IceStorm)
+hydra_component_add_boost_libraries(BasicRoutingService core thread)
+hydra_component_build_standalone(BasicRoutingService)
+hydra_component_install(BasicRoutingService RUNTIME bin "Basic Routing Service" Core)
commit 1491114e78e2611288c1edbc94c32f0df563ff43
Author: Ken Hunt <ken.hunt at digium.com>
Date: Thu Aug 5 17:55:36 2010 -0500
Moved slice defs out of this repo.
diff --git a/slice/Channel/ChannelServiceIf.ice b/slice/Channel/ChannelServiceIf.ice
deleted file mode 100644
index a037d3e..0000000
--- a/slice/Channel/ChannelServiceIf.ice
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <ServiceIf.ice>
-#include <Channel/SignalIf.ice>
-#include <Channel/EndpointIf.ice>
-
-module Hydra
-{
- module Channel
- {
- exception EndpointNotFound
- {
- string deviceId;
- };
-
- exception EndpointAlreadyRegistered
- {
- string deviceId
- };
-
-
- interface ChannelService extends Service
- {
- Endpoint *GetEndpoint(string deviceId) throws EndpointNotFound;
- };
-
- };
-
-};
-
diff --git a/slice/Channel/EndpointIf.ice b/slice/Channel/EndpointIf.ice
deleted file mode 100644
index 6fdc857..0000000
--- a/slice/Channel/EndpointIf.ice
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-module Hydra
-{
- module Channel
- {
- struct EndpointId
- {
- string channelId;
- string deviceId;
- };
-
- interface Endpoint extends Signal
- {
- EndpointId GetId();
- };
- };
-};
-
diff --git a/slice/Channel/SignalIf.ice b/slice/Channel/SignalIf.ice
deleted file mode 100644
index ea52bb0..0000000
--- a/slice/Channel/SignalIf.ice
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-module Hydra
-{
- module Channel
- {
- enum InviteResponse
- {
- OK,
- BUSY
- };
-
- exception DestinationNotFoundException
- {
- };
-
- exception UnknownSignalSource
- {
- };
-
-
- interface Signal
- {
- void Invite(Signal *source, string destId, string callerId)
- throws DestinationNotFoundException, UnknownSignalSource;
- void ReplyToInvite(Signal *replier, string replierId, InviteResponse response);
-
- void Ringing(Signal *source, string sourceId);
- void Connected(Signal *source, string sourceId);
- void Bye(Signal *source, string sourceId);
-
- void Redirect(Signal *old, Signal *new);
- };
- };
-};
-
diff --git a/slice/Event/EventIf.ice b/slice/Event/EventIf.ice
deleted file mode 100644
index ee2184b..0000000
--- a/slice/Event/EventIf.ice
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-module Hydra
-{
- module Event
- {
- // Interface for IceStorm topic named "::hydra::event::routing"
- interface Notification
- {
- void startup(string type, string name);
- void shutdown(string type, string name);
- };
-
- };
-
-};
diff --git a/slice/Routing/RoutingServiceIf.ice b/slice/Routing/RoutingServiceIf.ice
deleted file mode 100644
index 064f8a0..0000000
--- a/slice/Routing/RoutingServiceIf.ice
+++ /dev/null
@@ -1,66 +0,0 @@
-#pragma once
-
-#include <ServiceIf.ice>
-
-module Hydra
-{
- module Routing
- {
- exception DestinationNotFoundException
- {
- };
-
- exception DestinationExistsException
- {
- };
-
- exception InvalidParamsException
- {
- };
-
- interface RoutingService extends Service
- {
- idempotent Channel::Endpoint *Lookup(string deviceId) throws DestinationNotFoundException, InvalidParamsException;
- void AddEndpoint(string channelId, string deviceId) throws DestinationExistsException, InvalidParamsException;
- void RemoveEndpoint(string channelId, string deviceId) throws DestinationNotFoundException, InvalidParamsException;
- };
-
- sequence<string> StringSeq;
-
- interface RoutingServiceAdmin
- {
- void ClearEndpoints();
- void ClearEndpointsForChannel(string channelId);
-
- void LoadRoutingTable(string tableid);
- void SaveRoutingTable(string tableid);
- string GetRoutingTableId();
- StringSeq GetAvailableRoutingTables();
- };
-
-
- module Event
- {
- enum OperationResult
- {
- SUCCCESS,
- FAILED
- };
-
- // Interface for IceStorm topic named "::hydra::routing::event"
- interface RoutingEvents
- {
- void LookupEvent(string deviceId, OperationResult result);
- void AddEndpointEvent(string channelId, string deviceId, OperationResult result);
- void RemoveEndpointEvent(string channelId, string deviceId, OperationResult result);
- void ClearEndpointsEvent();
- void ClearEndpointsForChannelEvent(string channelId);
- void LoadRoutingTableEvent(string tableId, OperationResult result);
- void SaveRoutingTable(string tableId, OperationResult result);
- };
- };
-
- };
-
-};
-
diff --git a/slice/ServiceIf.ice b/slice/ServiceIf.ice
deleted file mode 100644
index b566e7c..0000000
--- a/slice/ServiceIf.ice
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-module Hydra
-{
- interface Service
- {
- string GetName();
- string GetCategory();
- };
-
-};
-
-
-----------------------------------------------------------------------
--
hydra/team/ken.hunt/routing.git
More information about the asterisk-scf-commits
mailing list