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

[Commits to the Asterisk SCF project code repositories]

branch "party-identification" has been updated
       via  e88235da56335ee7c43bbe281e27e645b5f74fc1 (commit)
       via  015148f4e1d0f9f3853d8c4c445a0c95f260c92e (commit)
      from  fefc9712692ad3e4db41c75d8469f8cf2e30d255 (commit)

Summary of changes:
 AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice |    2 +-
 AsteriskSCF/Media/MediaIf.ice                   |   10 +++++-----
 AsteriskSCF/Media/RTP/MediaRTPIf.ice            |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit e88235da56335ee7c43bbe281e27e645b5f74fc1
Merge: fefc971 015148f
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Apr 4 17:02:51 2011 -0300

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/slice into party-identification


commit 015148f4e1d0f9f3853d8c4c445a0c95f260c92e
Author: Brent Eagles <beagles at digium.com>
Date:   Thu Mar 31 11:07:06 2011 -0230

    Replace "preserve" meta data with unsliceable keyword.

diff --git a/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice b/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
index 49e684a..44fab7f 100644
--- a/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
+++ b/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
@@ -53,7 +53,7 @@ module V1
    /**
     * Generic service locator parameters class that more specific parameter classes can extend.
     */
-   ["preserved"] class ServiceLocatorParams
+   unsliceable class ServiceLocatorParams
    {
       /**
        * Basic category for the service, such as bridge or channel service.
diff --git a/AsteriskSCF/Media/MediaIf.ice b/AsteriskSCF/Media/MediaIf.ice
index 4d22fe0..9c79cd6 100644
--- a/AsteriskSCF/Media/MediaIf.ice
+++ b/AsteriskSCF/Media/MediaIf.ice
@@ -230,14 +230,14 @@ module V1
     * A generic format discovery class that can be extended for adding parameters. The parameters are used to find
     * a component capable of interpreting and providing a concrete class for a format.
     */
-   class FormatDiscovery extends AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams
+   unsliceable class FormatDiscovery extends AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams
    {
    };
 
    /**
     * A format discovery class that allows finding a format based on name.
     */
-   class FormatDiscoveryName extends FormatDiscovery
+   unsliceable class FormatDiscoveryName extends FormatDiscovery
    {
       /**
        * A string identifier for the format.
@@ -253,7 +253,7 @@ module V1
    /**
     * A format discovery class that allows finding a format based on information taken from SDP.
     */
-   class FormatDiscoverySDP extends FormatDiscovery
+   unsliceable class FormatDiscoverySDP extends FormatDiscovery
    {
       /**
        * Numerical payload value given in the SDP.
@@ -284,7 +284,7 @@ module V1
    /**
     * A format discovery class that allows finding a format based on numerical value, used for IAX2.
     */
-   class FormatDiscoveryIAX2 extends FormatDiscovery
+   unsliceable class FormatDiscoveryIAX2 extends FormatDiscovery
    {
       /**
        * Numerical codec flag value.
@@ -295,7 +295,7 @@ module V1
    /**
     * A format discovery class that allows finding an audio format based on a few parameters.
     */
-   class FormatDiscoveryGenericAudio extends FormatDiscovery
+   unsliceable class FormatDiscoveryGenericAudio extends FormatDiscovery
    {
       /**
        * String name of the codec being used.
diff --git a/AsteriskSCF/Media/RTP/MediaRTPIf.ice b/AsteriskSCF/Media/RTP/MediaRTPIf.ice
index 3bad522..b0cee7f 100644
--- a/AsteriskSCF/Media/RTP/MediaRTPIf.ice
+++ b/AsteriskSCF/Media/RTP/MediaRTPIf.ice
@@ -37,7 +37,7 @@ module V1
    /**
     * Extended discovery class for RTP media services.
     */
-   class RTPServiceLocatorParams extends AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams
+   unsliceable class RTPServiceLocatorParams extends AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams
    {
       /**
        * A sequence of formats that the RTP media service is expected to transport.

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


-- 
asterisk-scf/integration/slice.git