[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "party-identification" updated.

Commits to the Asterisk SCF project code repositories asterisk-scf-commits at lists.digium.com
Wed May 18 18:33:51 CDT 2011


branch "party-identification" has been updated
       via  9e584793b389279e5773d9b5a60534ff8c53ad9f (commit)
       via  41908861d2e4ce6627f2d3156b66b67c20e18a5b (commit)
       via  c06dbbefb20ab2f3bb3b2fbdf1eb714d304af928 (commit)
       via  1580f446b72d71abf9d49ec938d4b58e96d65792 (commit)
       via  98b9c735d7af93117d6320c5df05d200659f5161 (commit)
       via  1443edddb16e1ac462e51a1accbac8f225117356 (commit)
       via  db0812c0c896d51c136cb89fa3f7a14ba22ebf31 (commit)
       via  531f5fd38f97fbc3220f902a979bf172db50fdd2 (commit)
       via  ccc9fef2f724df94c7b313a815eda7dcb43ddcda (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  ca02bc78ac8a577b4b6b7267701b0c2f6b9c5d9a (commit)
       via  8e36ca4e38d9c05a52112233005739820d1d48c8 (commit)
       via  754feb2254c8e1fca87c77153d19c99f2415d582 (commit)
       via  97c62970be5412ecc69ba679e7cb57968fd64792 (commit)
       via  a790d38036eb58e1338e05377d85ba22424f1b5d (commit)
       via  7303842f83419759671508c0addaeaf45281bf11 (commit)
       via  c5e324b61fb53d05ccb174e521f523d5e56cc2ae (commit)
       via  ea4cc659bcdb66692356e01cc9244be1c9b98934 (commit)
       via  566a81e3cebf1f9b652136637d7dde6e63bd69f4 (commit)
       via  10e5d492b1801ff3c3260fc9aaff5a3676905285 (commit)
      from  34d2610bfac0e720e7b8e2336e984ba89be93c37 (commit)

Summary of changes:
 AsteriskSCF/Core/Routing/RoutingIf.ice             |  119 +-
 .../ISDNPartyIdentificationIf.ice                  |  108 ++
 .../PartyIdentificationIf.ice                      |   66 +-
 .../SessionCommunicationsIf.ice                    | 1128 +++++++++++---------
 .../System/Component/ComponentServiceIf.ice        |   94 ++-
 AsteriskSCF/System/Component/ConfigurationIf.ice   |  132 ++--
 AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice     |  122 +++
 AsteriskSCF/System/WorkQueue/WorkQueueIf.ice       |  276 +++++
 CMakeLists.txt                                     |   22 +-
 9 files changed, 1359 insertions(+), 708 deletions(-)
 create mode 100644 AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
 create mode 100644 AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
 create mode 100644 AsteriskSCF/System/WorkQueue/WorkQueueIf.ice


- Log -----------------------------------------------------------------
commit 9e584793b389279e5773d9b5a60534ff8c53ad9f
Author: Joshua Colp <jcolp at digium.com>
Date:   Wed May 18 20:35:01 2011 -0300

    Reduce the Party and move ISDN specific stuff to a separate slice file.

diff --git a/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice b/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
new file mode 100644
index 0000000..4fc93d1
--- /dev/null
+++ b/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
@@ -0,0 +1,108 @@
+/*
+ * Asterisk SCF -- An open-source communications framework.
+ *
+ * Copyright (C) 2011, Digium, Inc.
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk SCF project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE.txt file
+ * at the top of the source tree.
+ */
+
+#pragma once
+
+#include <AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice>
+
+module AsteriskSCF
+{
+
+module SessionCommunications
+{
+
+module PartyIdentification
+{
+
+["suppress"]
+module V1
+{
+   /**
+    * ISDN derived class for name part of party identification
+    */
+   unsliceable class IsdnName extends Name
+   {
+       /**
+	* Q.931 Presentation-indicator
+	*/
+       int presentation;
+
+       /**
+	* Q.931 Screening-indicator
+	*/
+       int screening;
+   };
+
+   /**
+    * ISDN derived class for number part of party identification
+    */
+   unsliceable class IsdnNumber extends Number
+   {
+       /**
+	* Q.931 Presentation-indicator
+	*/
+       int presentation;
+
+       /**
+	* Q.931 Screening-indicator
+	*/
+       int screening;
+
+       /**
+	* Q.931 Type-of-number
+	*/
+       int type_of_number;
+
+       /**
+	* Q.931 Numbering-plan
+	*/
+       int numbering_plan;
+   };
+
+   /**
+    * ISDN derived class for combined identity
+    */
+   unsliceable class IsdnId extends Id
+   {
+       /**
+	* Subaddress, if present
+	*/
+       Number subaddress;
+   };
+
+   /**
+    * ISDN derived class for calling party information
+    */
+   unsliceable class IsdnCaller extends Caller
+   {
+       /**
+	* ANI identity information
+	*/
+       Id ani;
+
+       /**
+	* ANI2 value
+	*/
+       int ani2;
+   };
+
+}; /* End of module V1 */
+
+}; /* End of module PartyIdentification */
+
+}; /* End of module SessionCommunications */
+
+}; /* End of module AsteriskSCF */
diff --git a/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice b/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
index 5f518a3..01fa9b6 100644
--- a/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
+++ b/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
@@ -36,18 +36,18 @@ module V1
    /**
     * Base class for name part of party identification
     */
-   unsliceable class PartyName
+   unsliceable class Name
    {
        /**
 	* String representation of the name
 	*/
-       string name;
+       string partyName;
    };
 
    /**
     * ISDN derived class for name part of party identification
     */
-   unsliceable class IsdnPartyName extends PartyName
+   unsliceable class IsdnPartyName extends Name
    {
        /**
 	* Q.931 Presentation-indicator
@@ -63,18 +63,18 @@ module V1
    /**
     * Base class for number part of party identification
     */
-   unsliceable class PartyNumber
+   unsliceable class Number
    {
        /**
 	* String representation of the number
 	*/
-       string number;
+       string partyNumber;
    };
 
    /**
     * ISDN derived class for number part of party identification
     */
-   unsliceable class IsdnPartyNumber extends PartyNumber
+   unsliceable class IsdnPartyNumber extends Number
    {
        /**
 	* Q.931 Presentation-indicator
@@ -100,66 +100,66 @@ module V1
    /**
     * Base class for combined identity of name and number
     */
-   unsliceable class PartyId
+   unsliceable class Id
    {
        /**
 	* Name of the party
 	*/
-       PartyName name;
+       Name partyName;
 
        /**
 	* Number of the party
 	*/
-       PartyNumber number;
+       Number partyNumber;
    };
 
    /**
     * ISDN derived class for combined identity
     */
-   unsliceable class IsdnPartyId extends PartyId
+   unsliceable class IsdnPartyId extends Id
    {
        /**
 	* Subaddress, if present
 	*/
-       PartyNumber subaddress;
+       Number subaddress;
    };
 
    /**
     * A sequence of identities
     */
-   sequence<PartyId> PartyIdSeq;
+   sequence<Id> IdSeq;
 
    /**
     * Base class for dialed party information
     */
-   unsliceable class PartyDialed
+   unsliceable class Dialed
    {
        /**
 	* Number that was dialed
 	*/
-       PartyNumber number;
+       Number partyNumber;
    };
 
    /**
     * Base class for calling party information
     */
-   unsliceable class PartyCaller
+   unsliceable class Caller
    {
        /**
 	* Identities of the caller
 	*/
-       PartyIdSeq ids;
+       IdSeq ids;
    };
 
    /**
     * ISDN derived class for calling party information
     */
-   unsliceable class IsdnPartyCaller extends PartyCaller
+   unsliceable class IsdnPartyCaller extends Caller
    {
        /**
 	* ANI identity information
 	*/
-       PartyId ani;
+       Id ani;
 
        /**
 	* ANI2 value
@@ -168,26 +168,26 @@ module V1
    };
 
    /**
-    * Derived class for connected line information, currently exactly like PartyCaller
+    * Derived class for connected line information, currently exactly like Caller
     */
-   unsliceable class PartyConnectedLine extends PartyCaller
+   unsliceable class ConnectedLine extends Caller
    {
    };
 
    /**
     * Base class for redirecting information
     */
-   unsliceable class PartyRedirecting
+   unsliceable class Redirecting
    {
        /**
 	* Party identification information for who the session is being redirected away from
 	*/
-       PartyId from;
+       Id from;
 
        /**
 	* Party identification information for who the session is being redirected to
 	*/
-       PartyId to;
+       Id to;
 
        /**
 	* Number of times the session has been redirected
@@ -205,45 +205,45 @@ module V1
 	*
 	* @return Concrete class containing caller party information
 	*
-	* @see PartyCaller
+	* @see Caller
 	*/
-       idempotent PartyCaller getCaller();
+       idempotent Caller getCaller();
 
        /**
 	* Method which retrieves dialed party identification information
 	*
 	* @return Concrete class containing dialed party information
 	*
-	* @see PartyDialed
+	* @see Dialed
 	*/
-       idempotent PartyDialed getDialed();
+       idempotent Dialed getDialed();
 
        /**
 	* Method which retrieves redirecting party identification information
 	*
 	* @return Concrete class containing redirecting party information
 	*
-	* @see PartyRedirecting
+	* @see Redirecting
 	*/
-       idempotent PartyRedirecting getRedirecting();
+       idempotent Redirecting getRedirecting();
 
        /**
 	* Method which updates connected line party information
 	*
 	* @param party Connected line party information
 	*
-	* @see PartyConnectedLine
+	* @see ConnectedLine
 	*/
-       void updateConnectedLine(PartyConnectedLine party);
+       void updateConnectedLine(ConnectedLine party);
 
        /**
 	* Method which updates redirecting party information
 	*
 	* @param party Redirecting party information
 	*
-	* @see PartyRedirecting
+	* @see Redirecting
 	*/
-       void updateRedirecting(PartyRedirecting party);
+       void updateRedirecting(Redirecting party);
    };
 
 }; /* End of module V1 */

commit 41908861d2e4ce6627f2d3156b66b67c20e18a5b
Merge: 34d2610 c06dbbe
Author: Joshua Colp <jcolp at digium.com>
Date:   Wed May 18 20:32:16 2011 -0300

    Merge branch 'master' into party-identification


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


-- 
asterisk-scf/integration/slice.git



More information about the asterisk-scf-commits mailing list