[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "session_cookies" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Apr 26 12:20:57 CDT 2011
branch "session_cookies" has been updated
via 68a428ba5f794eddc7c2ba326744f03d7dd96ce8 (commit)
via fb8079142c870dc2c2bd349809b496bf2411dde8 (commit)
via 9f9d5030c25864f2998439d0a648553a71528128 (commit)
via ed832a3e584ad82c47f5f3c76c1f024b91566420 (commit)
via 93dd1c75d62768e08bd1a36dc46b3b9fabeee9d2 (commit)
via f98052b0ad439cf31b1c3b0ba8991b095fa01fcd (commit)
via 5b26f4b5105b12808c7fe6159a947b0be28be2e6 (commit)
via e077c00402daaa531633522876fe75f3b8f4bf8b (commit)
via c2f50ada09a97344830c244f5a875cb3b6527202 (commit)
via 20084e7794523ce2a8d631b3246868a00676e92d (commit)
via 86ae6dcd9240f59c511281c63a4ee10f4d897473 (commit)
via 0e6af3eb07af0e4d4dd415d89926d368abb5d457 (commit)
via eae5f79313d4e024b751d169b9ede161327c916e (commit)
via b2f2ff479f36b49511c0ed021b488d7ca2996774 (commit)
via 015148f4e1d0f9f3853d8c4c445a0c95f260c92e (commit)
via ca02bc78ac8a577b4b6b7267701b0c2f6b9c5d9a (commit)
via 8e36ca4e38d9c05a52112233005739820d1d48c8 (commit)
via 754feb2254c8e1fca87c77153d19c99f2415d582 (commit)
via 5264bb1474a0b712b49fd4ea7c82890bdea007f2 (commit)
via 97c62970be5412ecc69ba679e7cb57968fd64792 (commit)
via a790d38036eb58e1338e05377d85ba22424f1b5d (commit)
via 7303842f83419759671508c0addaeaf45281bf11 (commit)
via c5e324b61fb53d05ccb174e521f523d5e56cc2ae (commit)
via ea4cc659bcdb66692356e01cc9244be1c9b98934 (commit)
via 566a81e3cebf1f9b652136637d7dde6e63bd69f4 (commit)
via 10e5d492b1801ff3c3260fc9aaff5a3676905285 (commit)
via 030aad466eccb71487a7443a99129d6ccd11502d (commit)
via 3710f1976fa50786ce5d5c5ccf9aa19d01613bf8 (commit)
via 3ecc809e33681d696a75670337140db4d51a8b5b (commit)
via 093dd4f755efcb495b31bb805838690d22138039 (commit)
via f08f95b47099e7310580f29f164c842d47f3061c (commit)
via fff2150a0cbf51c4848c59b46a822ecd99f7bb54 (commit)
via 0cde8ca15d8fe0848732a1d7fc2989a189af3f54 (commit)
via 89e06ac4dbdf1d9d6043a7770497dc83a05ae17a (commit)
via 06e3aa507539fe0e017ebcfce6d476e33507ff2e (commit)
via 82d142a052204f76cd21b8ecc58f69147e95491e (commit)
via 7d1de75662384731ee2816df25d089356102a8cd (commit)
via 2e556b3559e046ba4407f0e2924ba5e6e9a5f1eb (commit)
via a4973ac6594b05d24c50bd029ab28ce3623d71c2 (commit)
via b365c6903c0a09324ebdd9d664bf592fa127d5e4 (commit)
via 1512425da52259210df6fea339798a9351256a7c (commit)
via 9ea5281dc525bf6fcb641bca2f8dfbf27764f788 (commit)
via 6c31bea4b36ce5d3b0b3a93fdc8ef77df822bcca (commit)
via fe141a9ec5641b863173ef2831f0608b96e9d925 (commit)
via b2dadc2aaca3e4525da4b79fe1c14c8e79a56609 (commit)
via 5ac2f708432de5cd30c47895e61f710bb06b8f3f (commit)
via 738e77da64963e90ec4e26589aae698d3874573d (commit)
via f2f3868111b19b3abbcb629bc8c68bd3fde6e926 (commit)
via b96fd90a5a103a5972174e44b3ec84c90d89701f (commit)
via d8ee2a8a7aeb751da2fb34d05a91cf883a42f81e (commit)
via a5de8e041c94935e8c32886387529e9a8871dded (commit)
via 6977d58a29687a0432362526730a685f94a1cc59 (commit)
via 047f8c507d73e216eb0fbab40e7f7ee945c481a4 (commit)
via 20ba5407e321c043fda6618ad6facef8758be471 (commit)
via de60753b83864661cd9eeeef50fbcf094b1fea8f (commit)
via 067d8f5af43b78921aad0a7218c84cbc84f4f4c1 (commit)
via 51ea2042feb9c0732d20f43cd83b19e24d36e0ee (commit)
via 1aa6920d1e19c88a347c09cecc38dcd6ea781ed1 (commit)
via 18ffe3f2cda243ea1df79e9bc78c3d4ed15b570c (commit)
via a8830da8f9d4452140086a9bbf6f079274d92d46 (commit)
via 7df639e3f8ded32acdbf25de960ede9b64d9b481 (commit)
via 72b1fe6de5982f1e1d97808e4a7c28147fb4ccd6 (commit)
via 0020a940b1c0551b72977d39ab5a90ca9f74276c (commit)
via 968acad3916e463eac055f832288c990fd15ef11 (commit)
via b2c1ccb92363ec8e99d295843b6529efd73e0a03 (commit)
via aaac63aad229bd0ef45fb03a9b62ad453a717ea8 (commit)
from c35b6ff1ebd767530b6ce828a936bc0209aa893a (commit)
Summary of changes:
.gitignore | 6 +-
.../Core}/Discovery/ServiceLocatorEventsIf.ice | 0
.../Core}/Discovery/ServiceLocatorIf.ice | 6 +-
{Core => AsteriskSCF/Core}/Endpoint/EndpointIf.ice | 0
{Core => AsteriskSCF/Core}/Routing/RoutingIf.ice | 2 +-
{Media => AsteriskSCF/Media}/MediaIf.ice | 48 ++-
{Media => AsteriskSCF/Media}/RTP/MediaRTPIf.ice | 6 +-
AsteriskSCF/SIP/SIPExtensionPointIf.ice | 210 ++++++++++++
.../SessionCommunicationsIf.ice | 342 ++++++++++++++------
.../System}/Component/ComponentServiceIf.ice | 0
AsteriskSCF/System/Component/ConfigurationIf.ice | 184 +++++++++++
.../System}/Component/ReplicaIf.ice | 2 +-
.../System/ExceptionsIf.ice | 38 +--
.../System/Hook/HookIf.ice | 43 ++--
{System => AsteriskSCF/System}/Logger/LoggerIf.ice | 0
AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice | 122 +++++++
{System => AsteriskSCF/System}/Time/TimeIf.ice | 0
AsteriskSCF/System/WorkQueue/WorkQueueIf.ice | 276 ++++++++++++++++
CMakeLists.txt | 19 +-
Core/CMakeLists.txt | 8 -
Core/Discovery/CMakeLists.txt | 5 -
Core/Endpoint/CMakeLists.txt | 4 -
Core/Routing/CMakeLists.txt | 4 -
Media/CMakeLists.txt | 3 -
Media/RTP/CMakeLists.txt | 1 -
Properties/AssemblyInfo.cs | 12 +-
README_VISUALSTUDIO.txt | 22 +--
SessionCommunications/CMakeLists.txt | 2 -
System/CMakeLists.txt | 8 -
System/Component/CMakeLists.txt | 3 -
System/Logger/CMakeLists.txt | 2 -
System/Time/CMakeLists.txt | 2 -
...kSCFDotNetAPI.csproj => asterisk-scf-api.csproj | 6 +-
AsteriskSCFDotNetAPI.sln => asterisk-scf-api.sln | 2 +-
build.xml | 58 ++---
install-ice-jar.xml | 49 +++
make-mono-api.sh | 31 ++
make-python-api.sh | 34 ++
make-ruby-api.sh | 28 ++
sliceCSharpHelp.shfbproj | 4 +-
40 files changed, 1290 insertions(+), 302 deletions(-)
rename {Core => AsteriskSCF/Core}/Discovery/ServiceLocatorEventsIf.ice (100%)
rename {Core => AsteriskSCF/Core}/Discovery/ServiceLocatorIf.ice (98%)
rename {Core => AsteriskSCF/Core}/Endpoint/EndpointIf.ice (100%)
rename {Core => AsteriskSCF/Core}/Routing/RoutingIf.ice (99%)
rename {Media => AsteriskSCF/Media}/MediaIf.ice (93%)
rename {Media => AsteriskSCF/Media}/RTP/MediaRTPIf.ice (95%)
create mode 100644 AsteriskSCF/SIP/SIPExtensionPointIf.ice
rename {SessionCommunications => AsteriskSCF/SessionCommunications}/SessionCommunicationsIf.ice (77%)
rename {System => AsteriskSCF/System}/Component/ComponentServiceIf.ice (100%)
create mode 100644 AsteriskSCF/System/Component/ConfigurationIf.ice
rename {System => AsteriskSCF/System}/Component/ReplicaIf.ice (98%)
copy System/Time/TimeIf.ice => AsteriskSCF/System/ExceptionsIf.ice (55%)
copy System/Time/TimeIf.ice => AsteriskSCF/System/Hook/HookIf.ice (59%)
rename {System => AsteriskSCF/System}/Logger/LoggerIf.ice (100%)
create mode 100644 AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
rename {System => AsteriskSCF/System}/Time/TimeIf.ice (100%)
create mode 100644 AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
delete mode 100644 Core/CMakeLists.txt
delete mode 100644 Core/Discovery/CMakeLists.txt
delete mode 100644 Core/Endpoint/CMakeLists.txt
delete mode 100644 Core/Routing/CMakeLists.txt
delete mode 100644 Media/CMakeLists.txt
delete mode 100644 Media/RTP/CMakeLists.txt
delete mode 100644 SessionCommunications/CMakeLists.txt
delete mode 100644 System/CMakeLists.txt
delete mode 100644 System/Component/CMakeLists.txt
delete mode 100644 System/Logger/CMakeLists.txt
delete mode 100644 System/Time/CMakeLists.txt
rename AsteriskSCFDotNetAPI.csproj => asterisk-scf-api.csproj (97%)
rename AsteriskSCFDotNetAPI.sln => asterisk-scf-api.sln (83%)
create mode 100644 install-ice-jar.xml
create mode 100755 make-mono-api.sh
create mode 100755 make-python-api.sh
create mode 100755 make-ruby-api.sh
- Log -----------------------------------------------------------------
commit 68a428ba5f794eddc7c2ba326744f03d7dd96ce8
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Apr 26 14:11:39 2011 -0300
Add missing dictionary.
diff --git a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index cf05472..263d5d7 100644
--- a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -203,6 +203,11 @@ module V1
sequence <SessionCookie> SessionCookies;
/**
+ * A dictionary of cookies, used for storing them.
+ */
+ dictionary<string, SessionCookie> SessionCookieDict;
+
+ /**
* Indication that a session has completed.
*/
unsliceable class StoppedIndication extends TelephonyIndication
commit fb8079142c870dc2c2bd349809b496bf2411dde8
Merge: c35b6ff 9f9d503
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Apr 26 13:46:26 2011 -0300
Merge remote branch 'origin/master' into session_cookies
Conflicts:
AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
diff --cc AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index b9b68c2,b8e4d4c..cf05472
--- a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@@ -111,27 -114,138 +114,159 @@@ module V
};
/**
+ * Generic base class for 'cookies', opaque data items that can be
+ * stored on a Session and retrieved via the SessionListener
+ * interface when events occur on that Session.
+ *
+ * @see SessionListener
+ *
+ * @see SessionCookies
+ */
+ ["preserved"] class SessionCookie
+ {
+ };
+
+ /**
+ * Indication visitor class.
+ */
+ ["visitor"] local class IndicationVisitor
+ {
+ };
+
+ /**
+ * Basic indication class. Meant to be extended.
+ */
+ ["visitor:IndicationVisitor"] unsliceable class Indication
+ {
+ };
+
+ /**
+ * Telephony specific indication class. Useful if a consumer only cares
+ * about telephony specific indications.
+ */
+ unsliceable class TelephonyIndication extends Indication
+ {
+ };
+
+ /**
+ * Basic indication exception class. Meant to be extended.
+ */
+ unsliceable exception IndicationException
+ {
+ };
+
+ /**
+ * Indication that a session has reached a known connected state.
+ */
+ unsliceable class ConnectedIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a "flash" event has occurred on a session.
+ */
+ unsliceable class FlashedIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a session has entered a "held" state.
+ */
+ unsliceable class HeldIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a session is in a transitional state.
+ */
+ unsliceable class ProgressingIndication extends TelephonyIndication
+ {
+ /**
+ * Response code identifying the details of the ongoing progress.
+ */
+ ResponseCode response;
+ };
+
+ /**
+ * Indication that a "ring" event has occurred on a session.
+ */
+ unsliceable class RingingIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * A sequence of cookies, allowing for a variable number of them
+ * to be passed in a single operation or event.
+ *
+ * @see SessionListener
+ */
+ sequence <SessionCookie> SessionCookies;
+
+ /**
+ * Indication that a session has completed.
+ */
+ unsliceable class StoppedIndication extends TelephonyIndication
+ {
+ /**
+ * Response code identifying the details of why the session stopped.
+ */
+ ResponseCode response;
+ };
+
+ /**
+ * Indication that a session has left the "held" state.
+ */
+ unsliceable class UnheldIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a connect message should be sent on the session.
+ */
+ unsliceable class ConnectIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a flash message should be sent on the session.
+ */
+ unsliceable class FlashIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a hold message should be sent on the session.
+ */
+ unsliceable class HoldIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that an unhold message should be sent on the session.
+ */
+ unsliceable class UnholdIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a ring message should be sent on the session.
+ */
+ unsliceable class RingIndication extends TelephonyIndication
+ {
+ };
+
+ /**
+ * Indication that a progress message should be sent on the session.
+ */
+ unsliceable class ProgressIndication extends TelephonyIndication
+ {
+ /**
+ * Response code detailing the current progress.
+ */
+ ResponseCode response;
+ };
+
+ /**
* Instances of SessionListener are used for monitoring changes in one or
* more sessions. Session objects have an addListener method that allows
* SessionListener objects to be registered with a given session. The
@@@ -152,72 -258,18 +287,20 @@@
*/
interface SessionListener
{
- /**
- * Notification that a session has reached a known connected state.
- *
- * @param source The session the event occurred on.
- *
- * @param cookies Any cookies present on the session. which have types
- */
- void connected(Session* source, SessionCookies cookies);
-
- /**
- * Notification that a "flash" has occurred on a session.
- *
- * @param source The session the event occurred on.
- *
- * @param cookies Any cookies present on the session.
- */
- void flashed(Session* source, SessionCookies cookies);
-
- /**
- * Notification that a session has entered a "held" state.
- *
- * @param source The session the event occurred on.
- *
- * @param cookies Any cookies present on the session.
- */
- void held(Session* source, SessionCookies cookies);
-
- /**
- * Notification that a session is in a transitional state.
- *
- * @param source The session the event occurred on.
- *
- * @param cookies Any cookies present on the session.
- *
- * @param response An code indentifying the details of the ongoing progress.
- */
- void progressing(Session* source, SessionCookies cookies, ResponseCode response);
-
- /**
- * Notification that a ring "event" has occurred.
- *
- * @param source The session the event occurred on.
- *
- * @param cookies Any cookies present on the session.
- */
- void ringing(Session* source, SessionCookies cookies);
-
- /**
- * Notification that a session has completed.
- *
- * @param source The session the event occurred on.
- *
- * @param cookies Any cookies present on the session.
- *
- * @param response An code describing the why the session stopped.
- */
- void stopped(Session* source, SessionCookies cookies, ResponseCode response);
-
- /**
- * Notification that a session has left the "held" state.
- *
- * @param source The session the event occurred on.
+ /**
+ * Notification that some indication event has occurred on the session.
+ *
+ * @param source The session the event occurred on.
+ *
+ * @param event The indication event that has occurred.
+ *
+ * @param cookies Any cookies present on the session.
- */
- void unheld(Session* source, SessionCookies cookies);
+ *
+ * @see Session
+ *
+ * @see Indication
+ */
- void indicated(Session* source, Indication event);
++ void indicated(Session* source, Indication event, SessionCookies cookies);
};
/**
@@@ -250,52 -302,18 +333,55 @@@
*/
SessionInfo addListener(SessionListener* listener);
+ /**
+ * Set (or replace) cookies on the session.
+ *
+ * @param cookies A sequence of one or more concrete objects,
+ * each of which are of a type derived from SessionCookie.
+ * The session manager will store these cookies on the
+ * session, replacing any existing cookies with matching
+ * types.
+ *
+ * @note There can only be one cookie of a given type associated
+ * with a session.
+ **/
+ void setCookies(SessionCookies cookies);
+
+ /**
+ * Remove cookies from the session.
+ *
+ * @param cookies A sequence of one or more concrete objects,
+ * each of which are of a type derived from SessionCookie.
+ * The session manager will remove any cookies on the session
+ * with types that match the ones in this sequence; the
+ * content of the supplied cookies is not compared.
+ **/
+ void removeCookies(SessionCookies cookies);
+
+ /**
+ * Get cookies stored on the session.
+ *
+ * @param cookieTypes A sequence of zero or more concrete objects,
+ * each of which are of a type derived from SessionCookie.
+ *
+ * @return A sequence of zero or more cookies from the session,
+ * with types that match the types of the template cookies
+ * provided in the cookieTypes parameter.
+ **/
+ SessionCookies getCookies(SessionCookies cookieTypes);
+
- /**
- * Method which requests that the session send a connect message.
- */
- void connect();
-
- /**
- * Method which requests that the session send a flash message.
- */
- void flash();
+ /**
+ * Request that an indication be performed on a session.
+ *
+ * @param event The indication event to perform.
+ *
+ * @throws IndicationException if an error occurs.
+ *
+ * @see Indication
+ *
+ * @see IndicationException
+ */
+ void indicate(Indication event) throws IndicationException;
/**
* Method which retrieves a proxy to the endpoint object that created the current session.
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list