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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  bbe894a4f3e385bbd7738647f83fe9062f3d0c3f (commit)
       via  cb9cb444c3afa9ea5b0efb78ad2c1066d6fc990a (commit)
      from  4e6f751e82570a36d4592cb2acd0f6e31b2bdc43 (commit)

Summary of changes:
 SessionCommunications/SessionCommunicationsIf.ice |    6 +++---
 build.xml                                         |   16 +++++++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit bbe894a4f3e385bbd7738647f83fe9062f3d0c3f
Author: David M. Lee <dlee at digium.com>
Date:   Tue Nov 2 17:10:13 2010 -0500

    Build and install javadocs.

diff --git a/build.xml b/build.xml
index afb6915..f978f00 100644
--- a/build.xml
+++ b/build.xml
@@ -4,6 +4,7 @@
     <property name="slice2java-dir"
               value="target/generated-sources/slice2java"/>
     <property name="classes-dir" value="target/classes"/>
+    <property name="javadoc-dir" value="target/javadoc"/>
 
     <property name="mvn.version" value="2.1.1"/>
 
@@ -38,16 +39,29 @@
         </javac>
     </target>
 
-    <target name="package" depends="compile">
+    <target name="doc" depends="generate-sources">
+        <mkdir dir="${javadoc-dir}"/>
+        <javadoc sourcepath="${slice2java-dir}" destdir="${javadoc-dir}" use="true"
+                 verbose="false">
+            <classpath>
+                <pathelement location="${env.ICE_HOME}/lib/Ice.jar"/>
+            </classpath>
+        </javadoc>
+    </target>
+
+    <target name="package" depends="compile,doc">
         <jar jarfile="target/asterisk-scf-api.jar" basedir="${classes-dir}"/>
         <jar jarfile="target/asterisk-scf-api-src.jar"
              basedir="${slice2java-dir}"/>
+        <jar jarfile="target/asterisk-scf-api-javadoc.jar"
+             basedir="${javadoc-dir}"/>
     </target>
 
     <target name="install" depends="package">
         <artifact:pom id="pom" file="pom.xml"/>
         <artifact:install file="target/asterisk-scf-api.jar" pomrefid="pom">
             <attach file="target/asterisk-scf-api-src.jar" classifier="src"/>
+            <attach file="target/asterisk-scf-api-javadoc.jar" classifier="javadoc"/>
         </artifact:install>
     </target>
 

commit cb9cb444c3afa9ea5b0efb78ad2c1066d6fc990a
Author: David M. Lee <dlee at digium.com>
Date:   Tue Nov 2 17:04:24 2010 -0500

    Fixed @see links for slice2html.

diff --git a/SessionCommunications/SessionCommunicationsIf.ice b/SessionCommunications/SessionCommunicationsIf.ice
index faa2c18..92a7642 100644
--- a/SessionCommunications/SessionCommunicationsIf.ice
+++ b/SessionCommunications/SessionCommunicationsIf.ice
@@ -378,11 +378,11 @@ module V1
      * creating a session for a destination, creating a communication bridge
      * if required and adding the routed participants to it.
      *
-     * @see Bridging::V1::Bridge
+     * @see Bridging.V1.Bridge
      *
-     * @see Bridging::V1::BridgeFactory
+     * @see Bridging.V1.BridgeFactory
      *
-     * @see Bridging::V1::BridgeListener
+     * @see Bridging.V1.BridgeListener
      *
      */
     interface SessionRouter

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


-- 
asterisk-scf/integration/slice.git