[hydra-commits] hydra/slice.git branch "master" updated.

[Commits to the Hydra project code repositories]

branch "master" has been updated
       via  94314ce7f04eded10eab7c7db90d4cf06ece6ded (commit)
       via  a2640dee89a9b721e1a4c13e706d62159a620052 (commit)
      from  c504b2a1c5b2ec18ffbac48bca5f365ad60ad414 (commit)

Summary of changes:
 Core/CMakeLists.txt                            |    7 ++-----
 Core/Discovery/CMakeLists.txt                  |    5 +++++
 Core/{ => Discovery}/ServiceLocatorEventsI.ice |    0
 Core/{ => Discovery}/ServiceLocatorI.ice       |    0
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 Core/Discovery/CMakeLists.txt
 rename Core/{ => Discovery}/ServiceLocatorEventsI.ice (100%)
 rename Core/{ => Discovery}/ServiceLocatorI.ice (100%)


- Log -----------------------------------------------------------------
commit 94314ce7f04eded10eab7c7db90d4cf06ece6ded
Merge: a2640de c504b2a
Author: Joshua Colp <jcolp at digium.com>
Date:   Fri Aug 6 13:13:27 2010 -0300

    Merge branch 'master' of git.asterisk.org:hydra/slice

diff --cc Core/CMakeLists.txt
index 710a8b9,c7d360c..1241d12
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@@ -1,6 -1,11 +1,8 @@@
 -# Compile our service locator slice definition so we can then use it
 -hydra_compile_slice(ServiceLocatorI.ice lib "Slice Defined API" Core)
 -
 -# Can't forget about events
 -hydra_compile_slice(ServiceLocatorEventsI.ice lib "Slice Defined API" Core)
 +# Slice definitions for Discovery functionality
 +add_subdirectory(Discovery)
  
+ hydra_compile_slice(Service.ice lib "Slice Defined API" Core)
+ 
  # Slice definitions for Endpoint functionality
  add_subdirectory(Endpoint)
  

commit a2640dee89a9b721e1a4c13e706d62159a620052
Author: Joshua Colp <jcolp at digium.com>
Date:   Fri Aug 6 13:12:59 2010 -0300

    Move service locator slice definitions into Discovery per the UML. ALL HAIL THE UML!

diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 847f795..710a8b9 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -1,11 +1,8 @@
-# Compile our service locator slice definition so we can then use it
-hydra_compile_slice(ServiceLocatorI.ice lib "Slice Defined API" Core)
-
-# Can't forget about events
-hydra_compile_slice(ServiceLocatorEventsI.ice lib "Slice Defined API" Core)
+# Slice definitions for Discovery functionality
+add_subdirectory(Discovery)
 
 # Slice definitions for Endpoint functionality
 add_subdirectory(Endpoint)
 
 # Slice definitions for Routing functionality
-add_subdirectory(Routing)
\ No newline at end of file
+add_subdirectory(Routing)
diff --git a/Core/Discovery/CMakeLists.txt b/Core/Discovery/CMakeLists.txt
new file mode 100644
index 0000000..cc9b195
--- /dev/null
+++ b/Core/Discovery/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Compile our service locator slice definition so we can then use it
+hydra_compile_slice(ServiceLocatorI.ice lib "Slice Defined API" Core)
+
+# Can't forget about events
+hydra_compile_slice(ServiceLocatorEventsI.ice lib "Slice Defined API" Core)
diff --git a/Core/ServiceLocatorEventsI.ice b/Core/Discovery/ServiceLocatorEventsI.ice
similarity index 100%
rename from Core/ServiceLocatorEventsI.ice
rename to Core/Discovery/ServiceLocatorEventsI.ice
diff --git a/Core/ServiceLocatorI.ice b/Core/Discovery/ServiceLocatorI.ice
similarity index 100%
rename from Core/ServiceLocatorI.ice
rename to Core/Discovery/ServiceLocatorI.ice

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


-- 
hydra/slice.git