Move generateUUID to Ice

8 files changed, 14 insertions, 14 deletions

diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp
index 0e5f6a1f8be..60af9f7b2df 100644
--- a/cpp/src/IceGrid/AdminI.cpp
+++ b/cpp/src/IceGrid/AdminI.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
 
 #include <Ice/Ice.h>
 #include <Ice/LoggerUtil.h>
@@ -176,7 +176,7 @@ AdminI::addApplication(const ApplicationDescriptor& descriptor, const Current&)
     info.createUser = info.updateUser = _session->getId();
     info.descriptor = descriptor;
     info.revision = 1;
-    info.uuid = IceUtil::generateUUID();
+    info.uuid = Ice::generateUUID();
 
     _database->addApplication(info, _session.get());
 }
@@ -254,7 +254,7 @@ AdminI::patchApplication_async(const AMD_Admin_patchApplicationPtr& amdCB,
 
     Ice::Identity id;
     id.category = current.id.category;
-    id.name = IceUtil::generateUUID();
+    id.name = Ice::generateUUID();
 
     PatcherFeedbackAggregatorPtr feedback =
         newPatcherFeedback(amdCB, id, _traceLevels, "application", name, static_cast<int>(nodes.size()));
@@ -544,7 +544,7 @@ AdminI::patchServer_async(const AMD_Admin_patchServerPtr& amdCB, const string& i
 
     Ice::Identity identity;
     identity.category = current.id.category;
-    identity.name = IceUtil::generateUUID();
+    identity.name = Ice::generateUUID();
 
     PatcherFeedbackAggregatorPtr feedback =
         newPatcherFeedback(amdCB, identity, _traceLevels, "server", id, static_cast<int>(nodes.size()));
diff --git a/cpp/src/IceGrid/AdminSessionI.cpp b/cpp/src/IceGrid/AdminSessionI.cpp
index 05a6501fe15..7cc46f74757 100644
--- a/cpp/src/IceGrid/AdminSessionI.cpp
+++ b/cpp/src/IceGrid/AdminSessionI.cpp
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
 #include <IceGrid/RegistryI.h>
 #include <IceGrid/AdminSessionI.h>
 #include <IceGrid/AdminI.h>
@@ -135,7 +135,7 @@ AdminSessionI::_register(const SessionServantManagerPtr& servantManager, const I
 
     if(con)
     {
-        category = _database->getInstanceName() + "-" + IceUtil::generateUUID();
+        category = _database->getInstanceName() + "-" + Ice::generateUUID();
 
         Ice::Identity templateId;
         templateId.name = "pick-a-name";
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 1876182b942..c0c58603453 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -12,7 +12,7 @@
 #include <IceUtil/CtrlCHandler.h>
 #include <IceUtil/Thread.h>
 #include <IceUtil/StringUtil.h>
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/MutexPtrLock.h>
 #include <Ice/Ice.h>
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index bae445fa879..463effd1e98 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
 #include <IceUtil/Timer.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
diff --git a/cpp/src/IceGrid/NodeSessionI.cpp b/cpp/src/IceGrid/NodeSessionI.cpp
index 0842309e546..01bbb7679c0 100644
--- a/cpp/src/IceGrid/NodeSessionI.cpp
+++ b/cpp/src/IceGrid/NodeSessionI.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
 #include <Ice/Ice.h>
 #include <IceGrid/NodeSessionI.h>
 #include <IceGrid/Database.h>
@@ -305,7 +305,7 @@ NodeSessionI::patch(const PatcherFeedbackAggregatorPtr& aggregator,
 {
     Ice::Identity id;
     id.category = _database->getInstanceName();
-    id.name = IceUtil::generateUUID();
+    id.name = Ice::generateUUID();
 
     PatcherFeedbackPtr obj = new PatcherFeedbackI(_info->name, this, id, aggregator);
     try
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index 8ca6830132a..5f3de89880c 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
 #include <IceUtil/FileUtil.h>
 #include <Ice/Ice.h>
 #include <Ice/Network.h>
diff --git a/cpp/src/IceGrid/SessionI.cpp b/cpp/src/IceGrid/SessionI.cpp
index 6790b48f22d..5b018a5dfe9 100644
--- a/cpp/src/IceGrid/SessionI.cpp
+++ b/cpp/src/IceGrid/SessionI.cpp
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
 #include <IceGrid/SessionI.h>
 #include <IceGrid/QueryI.h>
 #include <IceGrid/LocatorI.h>
diff --git a/cpp/src/IceGrid/SessionServantManager.cpp b/cpp/src/IceGrid/SessionServantManager.cpp
index e61a2f4ce08..bc22aff6327 100644
--- a/cpp/src/IceGrid/SessionServantManager.cpp
+++ b/cpp/src/IceGrid/SessionServantManager.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <IceUtil/UUID.h>
+#include <Ice/UUID.h>
 #include <Ice/LocalException.h>
 #include <Ice/ObjectAdapter.h>
 #include <IceGrid/SessionServantManager.h>
@@ -272,7 +272,7 @@ SessionServantManager::addImpl(const Ice::ObjectPtr& servant, const Ice::ObjectP
     assert(p != _sessions.end());
 
     Ice::Identity id;
-    id.name = IceUtil::generateUUID();
+    id.name = Ice::generateUUID();
     id.category = _instanceName;
 
     //