[asterisk-scf-commits] team/dlee/slice.git branch "discovery-amd" updated.

[Commits to the Asterisk SCF project code repositories]

branch "discovery-amd" has been updated
  discards  39fb6035db5822c0e398768fee8671996c3f00f1 (commit)
       via  aaac63aad229bd0ef45fb03a9b62ad453a717ea8 (commit)
       via  6c8473ac7aa439f3537d54352df43cd9d4c98560 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (39fb6035db5822c0e398768fee8671996c3f00f1)
            \
             N -- N -- N (aaac63aad229bd0ef45fb03a9b62ad453a717ea8)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Summary of changes:
 build.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit aaac63aad229bd0ef45fb03a9b62ad453a717ea8
Author: David M. Lee <dlee at digium.com>
Date:   Fri Nov 19 09:39:00 2010 -0600

    Annotated ServiceLocator operations to use AMD.

diff --git a/Core/Discovery/ServiceLocatorIf.ice b/Core/Discovery/ServiceLocatorIf.ice
index 9f8a24a..e25b6da 100644
--- a/Core/Discovery/ServiceLocatorIf.ice
+++ b/Core/Discovery/ServiceLocatorIf.ice
@@ -76,6 +76,7 @@ module V1
        *
        * @throws ServiceNotFound if no service could be found that matches the given parameters.
        */
+      ["amd"]
       idempotent Object *locate(ServiceLocatorParams params) throws ServiceNotFound;
 
       /**
@@ -88,6 +89,7 @@ module V1
        *
        * @throws ServiceNotFound if no service could be found that matches the given parameters.
        */
+      ["amd"]
       idempotent Ice::ObjectProxySeq locateAll(ServiceLocatorParams params) throws ServiceNotFound;
    };
 

commit 6c8473ac7aa439f3537d54352df43cd9d4c98560
Author: David M. Lee <dlee at digium.com>
Date:   Tue Nov 23 16:52:04 2010 -0600

    Enable debug symbols for Java bindings.

diff --git a/build.xml b/build.xml
index 7ceeac9..b6ff105 100644
--- a/build.xml
+++ b/build.xml
@@ -59,7 +59,7 @@
     <target name="compile" depends="generate-sources"
             description="Compiles generated .java files">
         <mkdir dir="${classes-dir}"/>
-        <javac srcdir="${slice2java-dir}" destdir="${classes-dir}">
+        <javac srcdir="${slice2java-dir}" destdir="${classes-dir}" debug="true">
             <classpath>
                 <pathelement location="${env.ICE_HOME}/lib/Ice.jar"/>
             </classpath>

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


-- 
team/dlee/slice.git