[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "presence" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Oct 11 12:24:36 CDT 2011
branch "presence" has been updated
via c0122bc22473354ee2db96aa14add3455ece6ba0 (commit)
via 0e19069b526d8e61b63f5a7f6525db07ad156781 (commit)
via afd904dfcb0e60980d7912390bf287509b06fad0 (commit)
via 392bea5bac84da946d5990ddd7afb977bdcb102c (commit)
via 006cccac7e498e0faa88a747bdf39ba805198e41 (commit)
via 2078b4a3901eaa3984036ce505ea61e07eac1258 (commit)
via cb5988e9a49ed1a914a52de38e26585408ea7270 (commit)
via 5c9ba71d0434e5716d9ee58eb4ae5a60039967f5 (commit)
via 38c625182693d9900c734ded0055a66ca24fe01e (commit)
via 11fde89592c2d13346d7322b8d3591f2f104c5b0 (commit)
via 28ab66a1d742596f1b35030bf48e8b4a85a64b4a (commit)
via f7a6cfa0ce860cca6407d11ddf57699f117467fe (commit)
via 66bcc079b7ec83fb484756c9da3d09d160ab1cbd (commit)
via ef8832a77930c026fc93c1585ed9bdc448a91834 (commit)
via 08dce549dc9525de99a212081275b33e23d60b0b (commit)
via ff44d0e1ff76a086e4851c15604cf9d1ba9ad3fc (commit)
via ec6e9d9693aeb9935ba6665a10b81f2552349071 (commit)
via 767842b03dab3430d585abb505eb7772753f60c3 (commit)
via 2f28b8f7396b52bfd3a4298f65d798df599671a9 (commit)
via 72ed2a9023730c39c02999ae681bf591f3b3f574 (commit)
via b51c5c4e696cceb3a49318ee9ff76c08dc8328c4 (commit)
via d9c45ee516bb6e0fb4a64851c8f71278c85f62ca (commit)
via a2b0b33c81ba48bacfe985007af3c18ceca180ef (commit)
via 12b8d9c16293991aa0ecc59767d011694d19513c (commit)
via 1312c9c9d0f4c97f96f09a1291f6fe86710efda9 (commit)
via 1b7505e4fffb20d625ee87a9fc4609ac342d97c1 (commit)
via e1d7bec2ebf996566cdf548790c8e4b8d6f7af70 (commit)
via b7c0e575e27fb0575c3c3f23007444a35a4caca7 (commit)
via 47285632c983664f7cc3a5ef11dfaf0ae07887e0 (commit)
via 0a0f8a476847b42dd3fa66576cfeed3591bc2169 (commit)
via 08371c40e29b89e72a3acdc051757ae15f3c78b4 (commit)
via 953289a66556d717384244c36f73acc945562099 (commit)
via 91f56f1e7a481e13a0b42d0fb1d323ac3ad3cb91 (commit)
via ce9020326cff79fc41acb596241ff6641ea5af5f (commit)
via c1a96c506d66c71c874b2107c187bc5a28e8b4c3 (commit)
via 8e5e1f624b5fb5e498bb7d84a1172fa337e8bee3 (commit)
via 1a56884ce4ac84e41ab64499a635834f6cd71f63 (commit)
via 990dd70ce8143d48a2064b0100f4f34a9ec1d344 (commit)
via fde12f1f0f75904a355fe1db2c591da2fc6210cd (commit)
via e449cfaa1657a1299e3312a6ad5a5a4e2b6e1b0f (commit)
via 8c7018ca46f1c84877a451dacadcb8c3fee5ec01 (commit)
from a97c751d7b12264694c623fed88282324f8a1c54 (commit)
Summary of changes:
slice/AsteriskSCF/Media/Formats/AudioFormats.ice | 26 +
.../Formats/{AudioFormats.ice => OtherFormats.ice} | 35 +-
slice/AsteriskSCF/Media/Formats/T38UdptlFormat.ice | 118 +++++
slice/AsteriskSCF/Media/MediaIf.ice | 98 ++++-
slice/AsteriskSCF/Media/MediaOperationIf.ice | 91 ++++
slice/AsteriskSCF/Media/NetworkIf.ice | 97 ++++
slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice | 2 +-
slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice | 192 ++++++++
slice/AsteriskSCF/Presence/PresenceIf.ice | 93 +++--
slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice | 32 ++-
.../PartyIdentificationIf.ice | 143 ++----
.../SessionCommunicationsExtensionPointsIf.ice | 182 +++++++
.../SessionCommunicationsIf.ice | 505 +++++++++++---------
.../SessionCommunications/SessionCookieIf.ice | 56 +++
.../SessionCommunications/TelephonyEventsIf.ice | 27 +-
slice/AsteriskSCF/System/Logger/LoggerIf.ice | 18 +-
slice/AsteriskSCF/System/NAT/NATTraversalIf.ice | 4 +-
17 files changed, 1340 insertions(+), 379 deletions(-)
copy slice/AsteriskSCF/Media/Formats/{AudioFormats.ice => OtherFormats.ice} (56%)
create mode 100644 slice/AsteriskSCF/Media/Formats/T38UdptlFormat.ice
create mode 100644 slice/AsteriskSCF/Media/MediaOperationIf.ice
create mode 100644 slice/AsteriskSCF/Media/NetworkIf.ice
create mode 100644 slice/AsteriskSCF/Media/UDPTL/MediaUDPTLIf.ice
mode change 100644 => 100755 slice/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice
create mode 100644 slice/AsteriskSCF/SessionCommunications/SessionCookieIf.ice
- Log -----------------------------------------------------------------
commit c0122bc22473354ee2db96aa14add3455ece6ba0
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Oct 11 14:24:30 2011 -0300
Endpoint -> Resource
diff --git a/slice/AsteriskSCF/Presence/PresenceIf.ice b/slice/AsteriskSCF/Presence/PresenceIf.ice
index d28cf41..dad6e6c 100644
--- a/slice/AsteriskSCF/Presence/PresenceIf.ice
+++ b/slice/AsteriskSCF/Presence/PresenceIf.ice
@@ -38,62 +38,62 @@ module V1
enum State
{
/**
- * State of the given endpoint is not yet known.
+ * State of the given resource is not yet known.
*/
UNKNOWN,
/**
- * Endpoint is not in use.
+ * Resource is not in use.
*/
NOTINUSE,
/**
- * Endpoint is in use.
+ * Resource is in use.
*/
INUSE,
/**
- * Endpoint is busy.
+ * Resource is busy.
*/
BUSY,
/**
- * Given endpoint is invalid.
+ * Given resource is invalid.
*/
INVALID,
/**
- * Endpoint is currently unavailable.
+ * Resource is currently unavailable.
*/
UNAVAILABLE,
/**
- * Endpoint is ringing.
+ * Resource is ringing.
*/
RINGING,
/**
- * Endpoint is ringing and in use.
+ * Resource is ringing and in use.
*/
RINGINGINUSE,
/**
- * Endpoint is on hold.
+ * Resource is on hold.
*/
ONHOLD,
/**
- * Endpoint is away.
+ * Resource is away.
*/
AWAY,
/**
- * Endpoint does not wish to be disturbed.
+ * Resource does not wish to be disturbed.
*/
DONOTDISTURB,
/**
- * Endpoint has been away for quite awhile.
+ * Resource has been away for quite awhile.
*/
EXTENDEDAWAY,
@@ -104,23 +104,23 @@ module V1
};
/**
- * Class which contains presence information about an endpoint
+ * Class which contains presence information about an resource
*
* This class can be extended to provide additional status information specific to
- * the type of endpoint.
+ * the type of resource.
*/
unsliceable class Status
{
/**
- * Current state of the endpoint
+ * Current state of the resource
*/
State currentState;
};
/**
- * Dictionary of endpoints and their status
+ * Dictionary of resources and their status
*/
- dictionary<string, Status> EndpointStatusDict;
+ dictionary<string, Status> ResourceStatusDict;
/**
* Interface for a presence consumer
@@ -128,13 +128,13 @@ module V1
interface Consumer
{
/**
- * Method used to indicate that an endpoint has updated its status.
+ * Method used to indicate that an resource has updated its status.
*
- * @param endpoint Name of the endpoint that the status is for.
+ * @param resource Name of the resource that the status is for.
*
- * @param newStatus Concrete class containing the status of the endpoint.
+ * @param newStatus Concrete class containing the status of the resource.
*/
- void update(EndpointStatusDict newStatus);
+ void update(ResourceStatusDict newStatus);
};
/**
@@ -166,39 +166,39 @@ module V1
idempotent Token authenticate(Credentials authDetails);
/**
- * Method used to query for the current status of an endpoint.
+ * Method used to query for the current status of an resource.
*
* @param authToken Authentication token received when authenticate was called.
*
- * @param endpoints Name of the endpoints to get the status for.
+ * @param resources Name of the resources to get the status for.
*
- * @return EndpointStatusDict Dictionary containing status of requested endpoints.
+ * @return ResourceStatusDict Dictionary containing status of requested resources.
*/
- idempotent EndpointStatusDict query(Token authToken, Ice::StringSeq endpoints);
+ idempotent ResourceStatusDict query(Token authToken, Ice::StringSeq resources);
/**
- * Method used to subscribe to specific endpoint status updates.
+ * Method used to subscribe to specific resource status updates.
*
- * Note that the current status for each endpoint will be sent to the consumer before returning.
+ * Note that the current status for each resource will be sent to the consumer before returning.
*
* @param authToken Authentication token received when authenticate was called.
*
- * @param endpoints A sequence of endpoints to subscribe to.
+ * @param resources A sequence of resources to subscribe to.
*
- * @param presenceConsumer A proxy to a consumer that will receive status updates for the endpoints.
+ * @param presenceConsumer A proxy to a consumer that will receive status updates for the resources.
*
* @see Consumer
*/
- void subscribe(Token authToken, Ice::StringSeq endpoints, Consumer *presenceConsumer);
+ void subscribe(Token authToken, Ice::StringSeq resources, Consumer *presenceConsumer);
/**
- * Method used to unsubscribe from specific endpoint status updates.
+ * Method used to unsubscribe from specific resource status updates.
*
- * @param endpoints A sequence of endpoints that will no longer be subscribed to.
+ * @param resources A sequence of resources that will no longer be subscribed to.
*
* @param presenceConsumer A proxy to the consumer that was subscribed.
*/
- void unsubscribe(Ice::StringSeq endpoints, Consumer *presenceConsumer);
+ void unsubscribe(Ice::StringSeq resources, Consumer *presenceConsumer);
};
}; /* End of module V1 */
commit 0e19069b526d8e61b63f5a7f6525db07ad156781
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Oct 11 14:21:22 2011 -0300
Throw some auth stuff in per review.
diff --git a/slice/AsteriskSCF/Presence/PresenceIf.ice b/slice/AsteriskSCF/Presence/PresenceIf.ice
index fa45bd9..d28cf41 100644
--- a/slice/AsteriskSCF/Presence/PresenceIf.ice
+++ b/slice/AsteriskSCF/Presence/PresenceIf.ice
@@ -138,27 +138,50 @@ module V1
};
/**
+ * Class which contains authentication credentials, extended by the router implementation.
+ */
+ unsliceable class Credentials
+ {
+ };
+
+ /**
+ * Class which contains an authentication token, extended by the router implementation.
+ */
+ unsliceable class Token
+ {
+ };
+
+ /**
* Interface for a presence router
*/
interface Router extends Consumer
{
/**
+ * Method used to authenticate with the router.
+ *
+ * @param authDetails Authentication credentials.
+ *
+ * @return Token An authentication token if authenticated, none if not.
+ */
+ idempotent Token authenticate(Credentials authDetails);
+
+ /**
* Method used to query for the current status of an endpoint.
*
- * @param requestor Name of the endpoint requesting the status.
+ * @param authToken Authentication token received when authenticate was called.
*
* @param endpoints Name of the endpoints to get the status for.
*
* @return EndpointStatusDict Dictionary containing status of requested endpoints.
*/
- idempotent EndpointStatusDict query(string requestor, Ice::StringSeq endpoints);
+ idempotent EndpointStatusDict query(Token authToken, Ice::StringSeq endpoints);
/**
* Method used to subscribe to specific endpoint status updates.
*
* Note that the current status for each endpoint will be sent to the consumer before returning.
*
- * @param subscriber The name of the endpoint that is subscribing.
+ * @param authToken Authentication token received when authenticate was called.
*
* @param endpoints A sequence of endpoints to subscribe to.
*
@@ -166,7 +189,7 @@ module V1
*
* @see Consumer
*/
- void subscribe(string subscriber, Ice::StringSeq endpoints, Consumer *presenceConsumer);
+ void subscribe(Token authToken, Ice::StringSeq endpoints, Consumer *presenceConsumer);
/**
* Method used to unsubscribe from specific endpoint status updates.
commit afd904dfcb0e60980d7912390bf287509b06fad0
Merge: a97c751 392bea5
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Oct 11 14:14:27 2011 -0300
Merge branch 'master' into presence
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list