[asterisk-scf-commits] asterisk-scf/integration/slice.git branch "media" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Tue Jun 21 19:13:04 CDT 2011
branch "media" has been updated
via bb0fe22eb27c0744b020e7d7b74a589261eb528e (commit)
via 05e245ef7614b5f2ab3b2dfadd2ad1aa100952c9 (commit)
via 4af55933ca352d394f061566fabdb17fe1819fe9 (commit)
via 5bde5f1c7c787eb41293f1e14a69290a2bb1058a (commit)
via 7d3ebe303cee764b2ce58a7499d6dbf9e2dd04e6 (commit)
via 1544a2085af033d12cdec6a9be116acf4ee4f341 (commit)
via 8751373590bafab2a98e2128342b904f0a89bea7 (commit)
via 8e88ba6bbf08d0ccf50a3a6c47cb8aad7854099e (commit)
via 4373520fd6130317f96006cbf5d46f476bfa5cf7 (commit)
via b6bd3b77265589eb3d424f17ef499a37893694c7 (commit)
via a5e49d8afb63390b01f78db08d4f3405b0f3290c (commit)
via ab03f51f5e0a740bba0de6cb3263095196e77c29 (commit)
via 245a2ce4db47a58d4b967667f4f69965e5ae0856 (commit)
from 131f6d92c009e34dc41b79b076200876883cc34b (commit)
Summary of changes:
CMakeLists.txt | 16 +---
asterisk-scf-api.csproj => astscf-api.csproj | 46 +++++-----
asterisk-scf-api.sln => astscf-api.sln | 2 +-
build.xml | 18 ++--
dox-csharp.config | 4 +-
make-mono-api.sh | 10 +-
make-python-api.sh | 8 +-
make-ruby-api.sh | 8 +-
pom.xml.in | 2 +-
.../Core/Discovery/ServiceLocatorEventsIf.ice | 0
.../Core/Discovery/ServiceLocatorIf.ice | 0
.../AsteriskSCF}/Core/Endpoint/EndpointIf.ice | 0
.../AsteriskSCF}/Core/Routing/RoutingIf.ice | 0
.../AsteriskSCF}/Media/Formats/AudioFormats.ice | 0
.../AsteriskSCF}/Media/MediaIf.ice | 5 +
.../AsteriskSCF}/Media/RTP/MediaRTPIf.ice | 0
.../AsteriskSCF}/Media/SDP/MediaSDPIf.ice | 0
.../AsteriskSCF}/SIP/SIPExtensionPointIf.ice | 0
.../ISDNPartyIdentificationIf.ice | 0
.../PartyIdentificationIf.ice | 0
.../SessionCommunicationsIf.ice | 89 +++++++++++++++++++-
.../System/Component/ComponentServiceIf.ice | 0
.../System/Component/ConfigurationIf.ice | 0
.../AsteriskSCF}/System/Component/ReplicaIf.ice | 0
.../AsteriskSCF}/System/ExceptionsIf.ice | 0
.../AsteriskSCF}/System/Hook/HookIf.ice | 0
.../AsteriskSCF}/System/Logger/LoggerIf.ice | 0
.../System/ThreadPool/ThreadPoolIf.ice | 0
.../AsteriskSCF}/System/Time/TimeIf.ice | 0
.../AsteriskSCF}/System/WorkQueue/WorkQueueIf.ice | 0
slice/CMakeLists.txt | 12 +++
sliceCSharpHelp.shfbproj | 2 +-
32 files changed, 157 insertions(+), 65 deletions(-)
rename asterisk-scf-api.csproj => astscf-api.csproj (64%)
rename asterisk-scf-api.sln => astscf-api.sln (84%)
rename {AsteriskSCF => slice/AsteriskSCF}/Core/Discovery/ServiceLocatorEventsIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/Core/Discovery/ServiceLocatorIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/Core/Endpoint/EndpointIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/Core/Routing/RoutingIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/Media/Formats/AudioFormats.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/Media/MediaIf.ice (99%)
rename {AsteriskSCF => slice/AsteriskSCF}/Media/RTP/MediaRTPIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/Media/SDP/MediaSDPIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/SIP/SIPExtensionPointIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/SessionCommunications/ISDNPartyIdentificationIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/SessionCommunications/PartyIdentificationIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/SessionCommunications/SessionCommunicationsIf.ice (91%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/Component/ComponentServiceIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/Component/ConfigurationIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/Component/ReplicaIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/ExceptionsIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/Hook/HookIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/Logger/LoggerIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/ThreadPool/ThreadPoolIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/Time/TimeIf.ice (100%)
rename {AsteriskSCF => slice/AsteriskSCF}/System/WorkQueue/WorkQueueIf.ice (100%)
create mode 100644 slice/CMakeLists.txt
- Log -----------------------------------------------------------------
commit bb0fe22eb27c0744b020e7d7b74a589261eb528e
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Jun 21 21:12:53 2011 -0300
Add the ability to request that streams be added or removed from a session.
diff --git a/slice/AsteriskSCF/Media/MediaIf.ice b/slice/AsteriskSCF/Media/MediaIf.ice
index 5af9d9c..456064d 100644
--- a/slice/AsteriskSCF/Media/MediaIf.ice
+++ b/slice/AsteriskSCF/Media/MediaIf.ice
@@ -111,6 +111,11 @@ module V1
* Media is not being sent or received.
*/
Inactive,
+
+ /**
+ * The stream is no longer available.
+ */
+ Removed,
};
/**
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 6949ac4..507ce1e 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -462,6 +462,20 @@ module V1
["amd"] void changeStreamStates(AsteriskSCF::Media::V1::StreamStateDict streams);
/**
+ * Method which requests that streams be added to the session.
+ *
+ * @param streams A dictionary of streams and the requested formats.
+ */
+ void addStreams(AsteriskSCF::Media::V1::StreamInformationDict streams);
+
+ /**
+ * Method which requests that streams be removed from the session.
+ *
+ * @param streams A dictionary of streams to remove.
+ */
+ void removeStreams(AsteriskSCF::Media::V1::StreamInformationDict streams);
+
+ /**
* Retrieve a media session instance, if available, for the current session.
* A media session object may not be available at the time this is called.
* For example, in SIP before media details are known.
commit 05e245ef7614b5f2ab3b2dfadd2ad1aa100952c9
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Jun 21 20:50:35 2011 -0300
Move things to the proper place.
diff --git a/AsteriskSCF/Media/Formats/AudioFormats.ice b/slice/AsteriskSCF/Media/Formats/AudioFormats.ice
similarity index 100%
rename from AsteriskSCF/Media/Formats/AudioFormats.ice
rename to slice/AsteriskSCF/Media/Formats/AudioFormats.ice
diff --git a/AsteriskSCF/Media/SDP/MediaSDPIf.ice b/slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice
similarity index 100%
rename from AsteriskSCF/Media/SDP/MediaSDPIf.ice
rename to slice/AsteriskSCF/Media/SDP/MediaSDPIf.ice
commit 4af55933ca352d394f061566fabdb17fe1819fe9
Merge: 131f6d9 5bde5f1
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Jun 21 20:49:34 2011 -0300
Merge branch 'master' into media
commit 5bde5f1c7c787eb41293f1e14a69290a2bb1058a
Author: Joshua Colp <jcolp at digium.com>
Date: Tue Jun 21 17:01:14 2011 -0300
Merge session cookies support.
diff --git a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
index 7d53e82..7edc171 100644
--- a/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
+++ b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
@@ -114,6 +114,19 @@ module V1
};
/**
+ * 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
@@ -182,6 +195,19 @@ module V1
};
/**
+ * 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;
+
+ /**
+ * A dictionary of cookies, used for storing them.
+ */
+ dictionary<string, SessionCookie> SessionCookieDict;
+
+ /**
* Indication that a session has completed.
*/
unsliceable class StoppedIndication extends TelephonyIndication
@@ -252,9 +278,17 @@ module V1
* Session object then calls the SessionListener methods to notify
* listeners of changes as they occur.
*
+ * SessionListener objects can also store and retrieve 'cookies'; these
+ * are data items in the form of concrete objects of types derived from
+ * SessionCookie. The session manager will store and return these items
+ * in an opaque fashion, allowing a listener to store as much data, of
+ * any type it wishes, on a Session.
+ *
* A SessionListener object may be registered with multiple sessions.
*
* @see Session
+ *
+ * @see SessionCookies
*/
interface SessionListener
{
@@ -264,12 +298,14 @@ module V1
* @param source The session the event occurred on.
*
* @param event The indication event that has occurred.
+ *
+ * @param cookies Any cookies present on the session.
*
* @see Session
*
* @see Indication
*/
- void indicated(Session* source, Indication event);
+ void indicated(Session* source, Indication event, SessionCookies cookies);
};
/**
@@ -302,6 +338,43 @@ module V1
*/
["amd"] 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);
+
/**
* Request that an indication be performed on a session.
*
commit 7d3ebe303cee764b2ce58a7499d6dbf9e2dd04e6
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 21 14:02:59 2011 -0500
Update Visual Studio project/solution for 'slice' directory.
This revision updates the Visual Studio project/solution file, and the Doxygen
configuration file, to take into account that the Slice files have been moved
into a 'slice' directory. However, the project files are still incomplete.
diff --git a/asterisk-scf-api.csproj b/astscf-api.csproj
similarity index 64%
rename from asterisk-scf-api.csproj
rename to astscf-api.csproj
index bff5ef5..b46a6e4 100644
--- a/asterisk-scf-api.csproj
+++ b/astscf-api.csproj
@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AsteriskSCF</RootNamespace>
- <AssemblyName>AsteriskSCF-Api</AssemblyName>
+ <AssemblyName>ASTSCF-API</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<StartupObject>
@@ -52,31 +52,31 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Core\Discovery\ServiceLocatorEventsIf.cs" />
- <Compile Include="Core\Discovery\ServiceLocatorIf.cs" />
- <Compile Include="Core\Endpoint\EndpointIf.cs" />
- <Compile Include="Core\Routing\RoutingIf.cs" />
- <Compile Include="Media\MediaIf.cs" />
- <Compile Include="Media\RTP\MediaRTPIf.cs" />
+ <Compile Include="slice\AsteriskSCF\Core\Discovery\ServiceLocatorEventsIf.cs" />
+ <Compile Include="slice\AsteriskSCF\Core\Discovery\ServiceLocatorIf.cs" />
+ <Compile Include="slice\AsteriskSCF\Core\Endpoint\EndpointIf.cs" />
+ <Compile Include="slice\AsteriskSCF\Core\Routing\RoutingIf.cs" />
+ <Compile Include="slice\AsteriskSCF\Media\MediaIf.cs" />
+ <Compile Include="slice\AsteriskSCF\Media\RTP\MediaRTPIf.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="SessionCommunications\SessionCommunicationsIf.cs" />
- <Compile Include="System\Component\ComponentServiceIf.cs" />
- <Compile Include="System\Component\ReplicaIf.cs" />
- <Compile Include="System\Logger\LoggerIf.cs" />
- <Compile Include="System\Time\TimeIf.cs" />
+ <Compile Include="slice\AsteriskSCF\SessionCommunications\SessionCommunicationsIf.cs" />
+ <Compile Include="slice\AsteriskSCF\System\Component\ComponentServiceIf.cs" />
+ <Compile Include="slice\AsteriskSCF\System\Component\ReplicaIf.cs" />
+ <Compile Include="slice\AsteriskSCF\System\Logger\LoggerIf.cs" />
+ <Compile Include="slice\AsteriskSCF\System\Time\TimeIf.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="Core\Discovery\ServiceLocatorEventsIf.ice" />
- <None Include="Core\Discovery\ServiceLocatorIf.ice" />
- <None Include="Core\Endpoint\EndpointIf.ice" />
- <None Include="Core\Routing\RoutingIf.ice" />
- <None Include="Media\MediaIf.ice" />
- <None Include="Media\RTP\MediaRTPIf.ice" />
- <None Include="SessionCommunications\SessionCommunicationsIf.ice" />
- <None Include="System\Component\ComponentServiceIf.ice" />
- <None Include="System\Component\ReplicaIf.ice" />
- <None Include="System\Logger\LoggerIf.ice" />
- <None Include="System\Time\TimeIf.ice" />
+ <None Include="slice\AsteriskSCF\Core\Discovery\ServiceLocatorEventsIf.ice" />
+ <None Include="slice\AsteriskSCF\Core\Discovery\ServiceLocatorIf.ice" />
+ <None Include="slice\AsteriskSCF\Core\Endpoint\EndpointIf.ice" />
+ <None Include="slice\AsteriskSCF\Core\Routing\RoutingIf.ice" />
+ <None Include="slice\AsteriskSCF\Media\MediaIf.ice" />
+ <None Include="slice\AsteriskSCF\Media\RTP\MediaRTPIf.ice" />
+ <None Include="slice\AsteriskSCF\SessionCommunications\SessionCommunicationsIf.ice" />
+ <None Include="slice\AsteriskSCF\System\Component\ComponentServiceIf.ice" />
+ <None Include="slice\AsteriskSCF\System\Component\ReplicaIf.ice" />
+ <None Include="slice\AsteriskSCF\System\Logger\LoggerIf.ice" />
+ <None Include="slice\AsteriskSCF\System\Time\TimeIf.ice" />
</ItemGroup>
<ItemGroup>
<Content Include="README_VISUALSTUDIO.txt" />
diff --git a/asterisk-scf-api.sln b/astscf-api.sln
similarity index 84%
rename from asterisk-scf-api.sln
rename to astscf-api.sln
index c2bd743..27b821c 100644
--- a/asterisk-scf-api.sln
+++ b/astscf-api.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asterisk-scf-api", "asterisk-scf-api.csproj", "{EE231540-8BC5-43F5-95E3-BEBFABC7751F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "astscf-api", "astscf-api.csproj", "{EE231540-8BC5-43F5-95E3-BEBFABC7751F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/dox-csharp.config b/dox-csharp.config
index 81a44c4..a6f398d 100644
--- a/dox-csharp.config
+++ b/dox-csharp.config
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = AsteriskSCF
+PROJECT_NAME = "Asterisk SCF"
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
@@ -581,7 +581,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = Core Media SessionCommunications System
+INPUT = slice/AsteriskSCF
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
diff --git a/sliceCSharpHelp.shfbproj b/sliceCSharpHelp.shfbproj
index 920d30c..1a44f11 100644
--- a/sliceCSharpHelp.shfbproj
+++ b/sliceCSharpHelp.shfbproj
@@ -18,7 +18,7 @@
<HtmlHelpName>Documentation</HtmlHelpName>
<Language>en-US</Language>
<DocumentationSources>
- <DocumentationSource sourceFile="asterisk-scf-api.sln" />
+ <DocumentationSource sourceFile="astscf-api.sln" />
</DocumentationSources>
<CppCommentsFixup>True</CppCommentsFixup>
<ApiFilter>
commit 1544a2085af033d12cdec6a9be116acf4ee4f341
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 17 11:34:37 2011 -0500
Change Mono and Java API library names to be consistent with C++.
diff --git a/build.xml b/build.xml
index 9504ace..63807e3 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<project name="asterisk-scf-api" default="install"
+<project name="astscf-api" default="install"
xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<property environment="env"/>
<property name="slice2java-dir"
@@ -75,10 +75,10 @@
<target name="package" depends="compile,doc"
description="Packages binaries, sources and javadoc .jar's">
- <jar jarfile="java/asterisk-scf-api.jar" basedir="${classes-dir}"/>
- <jar jarfile="java/asterisk-scf-api-sources.jar"
+ <jar jarfile="java/astscf-api.jar" basedir="${classes-dir}"/>
+ <jar jarfile="java/astscf-api-sources.jar"
basedir="${slice2java-dir}"/>
- <jar jarfile="java/asterisk-scf-api-javadoc.jar"
+ <jar jarfile="java/astscf-api-javadoc.jar"
basedir="${javadoc-dir}"/>
</target>
@@ -87,10 +87,10 @@
<copy file="pom.xml.in" tofile="${generated-pom-dir}/pom.xml"
filtering="true" failonerror="true"/>
<artifact:pom id="pom" file="${generated-pom-dir}/pom.xml"/>
- <artifact:install file="java/asterisk-scf-api.jar" pomrefid="pom">
- <attach file="java/asterisk-scf-api-sources.jar"
+ <artifact:install file="java/astscf-api.jar" pomrefid="pom">
+ <attach file="java/astscf-api-sources.jar"
classifier="sources"/>
- <attach file="java/asterisk-scf-api-javadoc.jar"
+ <attach file="java/astscf-api-javadoc.jar"
classifier="javadoc"/>
</artifact:install>
</target>
diff --git a/make-mono-api.sh b/make-mono-api.sh
index 467daf8..c003c5d 100755
--- a/make-mono-api.sh
+++ b/make-mono-api.sh
@@ -26,6 +26,6 @@ do
done
echo "Compiling generated C# into a library..."
-gmcs -debug -out:mono/asterisk-scf-api.dll -t:library -recurse:'mono/generated/*.cs' Properties/AssemblyInfo.cs "-lib:${ICE_HOME}/bin" -r:Ice
+gmcs -debug -out:mono/astscf-api.dll -t:library -recurse:'mono/generated/*.cs' Properties/AssemblyInfo.cs "-lib:${ICE_HOME}/bin" -r:Ice
echo "Finished."
diff --git a/pom.xml.in b/pom.xml.in
index 3646d3a..e7e18a6 100644
--- a/pom.xml.in
+++ b/pom.xml.in
@@ -9,7 +9,7 @@
<artifactId>api</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>Asterisk SCF Ice API</name>
+ <name>Asterisk SCF API</name>
<dependencies>
<dependency>
commit 8751373590bafab2a98e2128342b904f0a89bea7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 17 11:32:38 2011 -0500
Update Java build files for 'slice' subdirectory.
diff --git a/build.xml b/build.xml
index 3d8e485..9504ace 100644
--- a/build.xml
+++ b/build.xml
@@ -31,10 +31,10 @@
<slice2java outputdir="${slice2java-dir}"
stream="true" underscore="true" checksum="AsteriskSCF.APIChecksums">
<fileset dir=".">
- <include name="**/*.ice"/>
+ <include name="slice/**/*.ice"/>
</fileset>
<includepath>
- <pathelement location="."/>
+ <pathelement location="slice"/>
<pathelement location="${env.ICE_HOME}/slice"/>
</includepath>
</slice2java>
commit 8e88ba6bbf08d0ccf50a3a6c47cb8aad7854099e
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Fri Jun 17 11:21:29 2011 -0500
Update Mono, Python and Ruby API build scripts for 'slice' directory.
diff --git a/make-mono-api.sh b/make-mono-api.sh
index 15ecb93..467daf8 100755
--- a/make-mono-api.sh
+++ b/make-mono-api.sh
@@ -17,12 +17,12 @@ rm -rf mono
mkdir -p mono/generated
-find AsteriskSCF -name \*.ice -print | while read slice
+find slice/AsteriskSCF -name \*.ice -print | while read slice
do
- slicedir=`dirname "${slice}"`
+ slicedir=`dirname "${slice:6}"`
mkdir -p "mono/generated/${slicedir}"
- echo "Translating ${slice} into C#..."
- ${ICE_HOME}/bin/slice2cs -I ${ICE_HOME}/slice -I . --output-dir "mono/generated/${slicedir}" --stream --checksum --plugin SliceVisitorPattern:create "${slice}"
+ echo "Translating ${slice:6} into C#..."
+ ${ICE_HOME}/bin/slice2cs -I ${ICE_HOME}/slice -I slice --output-dir "mono/generated/${slicedir}" --stream --underscore --checksum --plugin SliceVisitorPattern:create "${slice}"
done
echo "Compiling generated C# into a library..."
diff --git a/make-python-api.sh b/make-python-api.sh
index 3300179..006f8a9 100755
--- a/make-python-api.sh
+++ b/make-python-api.sh
@@ -17,12 +17,12 @@ rm -rf python
mkdir python
-find AsteriskSCF -name \*.ice -print | while read slice
+find slice/AsteriskSCF -name \*.ice -print | while read slice
do
- slicedir=`dirname "${slice}"`
+ slicedir=`dirname "${slice:6}"`
prefix="${slicedir//\//_}_"
- echo "Translating ${slice} into Python..."
- ${ICE_HOME}/bin/slice2py -I ${ICE_HOME}/slice -I . --output-dir python --checksum --plugin SliceVisitorPattern:create --prefix "${prefix}" "${slice}"
+ echo "Translating ${slice:6} into Python..."
+ ${ICE_HOME}/bin/slice2py -I ${ICE_HOME}/slice -I slice --output-dir python --underscore --checksum --plugin SliceVisitorPattern:create --prefix "${prefix}" "${slice}"
done
find python -name \*.py -print | while read py
diff --git a/make-ruby-api.sh b/make-ruby-api.sh
index decc27a..50153e8 100755
--- a/make-ruby-api.sh
+++ b/make-ruby-api.sh
@@ -17,12 +17,12 @@ rm -rf ruby
mkdir ruby
-find AsteriskSCF -name \*.ice -print | while read slice
+find slice/AsteriskSCF -name \*.ice -print | while read slice
do
- slicedir=`dirname "${slice}"`
+ slicedir=`dirname "${slice:6}"`
mkdir -p "ruby/${slicedir}"
- echo "Translating ${slice} into Ruby..."
- ${ICE_HOME}/bin/slice2rb -I ${ICE_HOME}/slice -I . --output-dir "ruby/${slicedir}" --checksum --plugin SliceVisitorPattern:create "${slice}"
+ echo "Translating ${slice:6} into Ruby..."
+ ${ICE_HOME}/bin/slice2rb -I ${ICE_HOME}/slice -I slice --output-dir "ruby/${slicedir}" --underscore --checksum --plugin SliceVisitorPattern:create "${slice}"
done
echo "Finished."
commit 4373520fd6130317f96006cbf5d46f476bfa5cf7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 15 16:40:16 2011 -0500
Relocate Slice files to a 'slice' subdirectory.
In order to be able to easily use the Slice collections support in AsteriskSCF.cmake,
and have the astscf_slice_collection_install() function produce the desired result,
Slice files need to be located in a subdirectory of the repository, not its root. This commit moves them into a 'slice' directory, just like all the other
repositories have.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d64ead..b8b6d76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,3 @@
astscf_project(API 3.4)
-astscf_slice_collection(GLOBAL
- NAME ASTSCF
- PATH .
- HEADERS "${CMAKE_CURRENT_BINARY_DIR}/astscf-api/slice-ASTSCF"
- LIBRARY astscf-api
- )
-astscf_slice_include_collection(ASTSCF)
-
-astscf_component_init(astscf-api)
-astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
-astscf_component_build_library(astscf-api)
-astscf_component_install(astscf-api)
-
-astscf_slice_headers_install()
-astscf_slice_install(AsteriskSCF)
+add_subdirectory(slice)
diff --git a/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
similarity index 100%
rename from AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
rename to slice/AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.ice
diff --git a/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice b/slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
similarity index 100%
rename from AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
rename to slice/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice
diff --git a/AsteriskSCF/Core/Endpoint/EndpointIf.ice b/slice/AsteriskSCF/Core/Endpoint/EndpointIf.ice
similarity index 100%
rename from AsteriskSCF/Core/Endpoint/EndpointIf.ice
rename to slice/AsteriskSCF/Core/Endpoint/EndpointIf.ice
diff --git a/AsteriskSCF/Core/Routing/RoutingIf.ice b/slice/AsteriskSCF/Core/Routing/RoutingIf.ice
similarity index 100%
rename from AsteriskSCF/Core/Routing/RoutingIf.ice
rename to slice/AsteriskSCF/Core/Routing/RoutingIf.ice
diff --git a/AsteriskSCF/Media/MediaIf.ice b/slice/AsteriskSCF/Media/MediaIf.ice
similarity index 100%
rename from AsteriskSCF/Media/MediaIf.ice
rename to slice/AsteriskSCF/Media/MediaIf.ice
diff --git a/AsteriskSCF/Media/RTP/MediaRTPIf.ice b/slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
similarity index 100%
rename from AsteriskSCF/Media/RTP/MediaRTPIf.ice
rename to slice/AsteriskSCF/Media/RTP/MediaRTPIf.ice
diff --git a/AsteriskSCF/SIP/SIPExtensionPointIf.ice b/slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
similarity index 100%
rename from AsteriskSCF/SIP/SIPExtensionPointIf.ice
rename to slice/AsteriskSCF/SIP/SIPExtensionPointIf.ice
diff --git a/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice b/slice/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
similarity index 100%
rename from AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
rename to slice/AsteriskSCF/SessionCommunications/ISDNPartyIdentificationIf.ice
diff --git a/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice b/slice/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
similarity index 100%
rename from AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
rename to slice/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice
diff --git a/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice b/slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
similarity index 100%
rename from AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
rename to slice/AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice
diff --git a/AsteriskSCF/System/Component/ComponentServiceIf.ice b/slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
similarity index 100%
rename from AsteriskSCF/System/Component/ComponentServiceIf.ice
rename to slice/AsteriskSCF/System/Component/ComponentServiceIf.ice
diff --git a/AsteriskSCF/System/Component/ConfigurationIf.ice b/slice/AsteriskSCF/System/Component/ConfigurationIf.ice
similarity index 100%
rename from AsteriskSCF/System/Component/ConfigurationIf.ice
rename to slice/AsteriskSCF/System/Component/ConfigurationIf.ice
diff --git a/AsteriskSCF/System/Component/ReplicaIf.ice b/slice/AsteriskSCF/System/Component/ReplicaIf.ice
similarity index 100%
rename from AsteriskSCF/System/Component/ReplicaIf.ice
rename to slice/AsteriskSCF/System/Component/ReplicaIf.ice
diff --git a/AsteriskSCF/System/ExceptionsIf.ice b/slice/AsteriskSCF/System/ExceptionsIf.ice
similarity index 100%
rename from AsteriskSCF/System/ExceptionsIf.ice
rename to slice/AsteriskSCF/System/ExceptionsIf.ice
diff --git a/AsteriskSCF/System/Hook/HookIf.ice b/slice/AsteriskSCF/System/Hook/HookIf.ice
similarity index 100%
rename from AsteriskSCF/System/Hook/HookIf.ice
rename to slice/AsteriskSCF/System/Hook/HookIf.ice
diff --git a/AsteriskSCF/System/Logger/LoggerIf.ice b/slice/AsteriskSCF/System/Logger/LoggerIf.ice
similarity index 100%
rename from AsteriskSCF/System/Logger/LoggerIf.ice
rename to slice/AsteriskSCF/System/Logger/LoggerIf.ice
diff --git a/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice b/slice/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
similarity index 100%
rename from AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
rename to slice/AsteriskSCF/System/ThreadPool/ThreadPoolIf.ice
diff --git a/AsteriskSCF/System/Time/TimeIf.ice b/slice/AsteriskSCF/System/Time/TimeIf.ice
similarity index 100%
rename from AsteriskSCF/System/Time/TimeIf.ice
rename to slice/AsteriskSCF/System/Time/TimeIf.ice
diff --git a/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice b/slice/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
similarity index 100%
rename from AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
rename to slice/AsteriskSCF/System/WorkQueue/WorkQueueIf.ice
diff --git a/CMakeLists.txt b/slice/CMakeLists.txt
similarity index 75%
copy from CMakeLists.txt
copy to slice/CMakeLists.txt
index 9d64ead..06616e2 100644
--- a/CMakeLists.txt
+++ b/slice/CMakeLists.txt
@@ -1,5 +1,3 @@
-astscf_project(API 3.4)
-
astscf_slice_collection(GLOBAL
NAME ASTSCF
PATH .
@@ -11,7 +9,4 @@ astscf_slice_include_collection(ASTSCF)
astscf_component_init(astscf-api)
astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
astscf_component_build_library(astscf-api)
-astscf_component_install(astscf-api)
-
-astscf_slice_headers_install()
-astscf_slice_install(AsteriskSCF)
+astscf_slice_collection_install(ASTSCF)
commit b6bd3b77265589eb3d424f17ef499a37893694c7
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 14 17:24:31 2011 -0500
Use Slice collections support in AsteriskSCF.cmake.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ac2fd6..9d64ead 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,12 @@
astscf_project(API 3.4)
-set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/astscf-api/slice-ASTSCF PARENT_SCOPE)
+astscf_slice_collection(GLOBAL
+ NAME ASTSCF
+ PATH .
+ HEADERS "${CMAKE_CURRENT_BINARY_DIR}/astscf-api/slice-ASTSCF"
+ LIBRARY astscf-api
+ )
+astscf_slice_include_collection(ASTSCF)
astscf_component_init(astscf-api)
astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
commit a5e49d8afb63390b01f78db08d4f3405b0f3290c
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Tue Jun 7 16:53:52 2011 -0500
Use proper path for generated headers.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 636e6b9..1ac2fd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
astscf_project(API 3.4)
-set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/slice-ASTSCF PARENT_SCOPE)
+set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/astscf-api/slice-ASTSCF PARENT_SCOPE)
astscf_component_init(astscf-api)
astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
commit ab03f51f5e0a740bba0de6cb3263095196e77c29
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Mon Jun 6 18:50:27 2011 -0500
Slice collections, and consistency of naming in various places.
* Support Slice file 'collections'.
* Make all Slice directories in repositories be called 'slice' and at the
top level in the repository, so the automatic 'PROJECT' collection will
be generated for them.
* Build ice-util-cpp and util-cpp as single libraries.
* Enable building and execution of ice-util-cpp top-level unit tests.
Conflicts:
cmake/example/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5341674..636e6b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,11 @@
astscf_project(API 3.4)
-set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
-set(API_SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/slice-ASTSCF PARENT_SCOPE)
-# Make all of our slice definitions available to... themselves!
-astscf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-astscf_component_init(asterisk-scf-api)
-astscf_component_add_slice(asterisk-scf-api GLOB_RECURSE "AsteriskSCF/*.ice")
-astscf_component_build_library(asterisk-scf-api)
-astscf_component_install(asterisk-scf-api)
+astscf_component_init(astscf-api)
+astscf_component_add_slices(astscf-api ASTSCF GLOB_RECURSE "AsteriskSCF/*.ice")
+astscf_component_build_library(astscf-api)
+astscf_component_install(astscf-api)
astscf_slice_headers_install()
astscf_slice_install(AsteriskSCF)
commit 245a2ce4db47a58d4b967667f4f69965e5ae0856
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Thu Jun 2 18:02:07 2011 -0500
Update to use 'astscf' prefix in CMake scripts instead of 'asterisk_scf'.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa8dfb6..5341674 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
-asterisk_scf_project(API 3.4)
+astscf_project(API 3.4)
set(API_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/generated PARENT_SCOPE)
set(API_SLICE_DIR ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
# Make all of our slice definitions available to... themselves!
-asterisk_scf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+astscf_slice_include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-asterisk_scf_component_init(asterisk-scf-api)
-asterisk_scf_component_add_slice(asterisk-scf-api GLOB_RECURSE "AsteriskSCF/*.ice")
-asterisk_scf_component_build_library(asterisk-scf-api)
-asterisk_scf_component_install(asterisk-scf-api)
+astscf_component_init(asterisk-scf-api)
+astscf_component_add_slice(asterisk-scf-api GLOB_RECURSE "AsteriskSCF/*.ice")
+astscf_component_build_library(asterisk-scf-api)
+astscf_component_install(asterisk-scf-api)
-asterisk_scf_slice_headers_install()
-asterisk_scf_slice_install(AsteriskSCF)
+astscf_slice_headers_install()
+astscf_slice_install(AsteriskSCF)
-----------------------------------------------------------------------
--
asterisk-scf/integration/slice.git
More information about the asterisk-scf-commits
mailing list