Renamed the server and service data directories to data and data_<service>

3 files changed, 36 insertions, 25 deletions

diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index 05b48ecdc5f..8e0dc556420 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -1065,9 +1065,9 @@ Resolver::getReserved()
     reserved["application.distrib"] = "${node.data}/distrib/${application}";
     reserved["server.distrib"] = "${node.data}/servers/${server}/distrib";
     reserved["server"] = "";
-    reserved["server.data"] = "${node.data}/servers/${server}/server_data";
+    reserved["server.data"] = "${node.data}/servers/${server}/data";
     reserved["service"] = "";
-    reserved["service.data"] = "${node.data}/servers/${server}/service_data/${service}";
+    reserved["service.data"] = "${node.data}/servers/${server}/data_${service}";
     return reserved;
 }
 
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index 242f46d01c2..9e9498e1d07 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -1221,8 +1221,16 @@ NodeI::canRemoveServerDirectory(const string& name)
     contents.erase("config");
     contents.erase("distrib");
     contents.erase("revision");
-    contents.erase("server_data");
-    contents.erase("service_data");
+    contents.erase("data");
+    Ice::StringSeq serviceDataDirs;
+    for(set<string>::const_iterator p = contents.begin(); p != contents.end(); ++p)
+    {
+        if(p->find("data_") != 0)
+        {
+            return false;
+        }
+        serviceDataDirs.push_back(*p);
+    }
     if(!contents.empty())
     {
         return false;
@@ -1259,31 +1267,27 @@ NodeI::canRemoveServerDirectory(const string& name)
         }
     }
 
-    if(IceUtilInternal::directoryExists(_serversDir + "/" + name + "/server_data"))
+    if(IceUtilInternal::directoryExists(_serversDir + "/" + name + "/data"))
     {
-        if(!readDirectory(_serversDir + "/" + name + "/server_data").empty())
+        if(!readDirectory(_serversDir + "/" + name + "/data").empty())
         {
             return false;
         }
     }
 
-    if(IceUtilInternal::directoryExists(_serversDir + "/" + name + "/service_data"))
+    for(Ice::StringSeq::const_iterator p = serviceDataDirs.begin(); p != serviceDataDirs.end(); ++p)
     {
-        c = readDirectory(_serversDir + "/" + name + "/service_data");
-        for(Ice::StringSeq::const_iterator p = c.begin() ; p != c.end(); ++p)
+        try
         {
-            try
-            {
-                if(!readDirectory(_serversDir + "/" + name + "/service_data/" + *p).empty())
-                {
-                    return false;
-                }
-            }
-            catch(const string&)
+            if(!readDirectory(_serversDir + "/" + name + "/" + *p).empty())
             {
                 return false;
             }
         }
+        catch(const string&)
+        {
+            return false;
+        }
     }
     return true;
 }
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 4a009862139..0161c820c53 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2309,8 +2309,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
     IcePatch2Internal::createDirectory(_serverDir + "/config");
     IcePatch2Internal::createDirectory(_serverDir + "/dbs");
     IcePatch2Internal::createDirectory(_serverDir + "/distrib");
-    IcePatch2Internal::createDirectory(_serverDir + "/server_data");
-    IcePatch2Internal::createDirectory(_serverDir + "/service_data");
+    IcePatch2Internal::createDirectory(_serverDir + "/data");
 
     //
     // Create the configuration files, remove the old ones.
@@ -2378,27 +2377,35 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
         Ice::StringSeq knownDirs;
         for(Ice::StringSeq::const_iterator q = _desc->services->begin(); q != _desc->services->end(); ++q)
         {
-            knownDirs.push_back(*q);
-            IcePatch2Internal::createDirectory(_serverDir + "/service_data/" + *q);
+            knownDirs.push_back("data_" + *q);
+            IcePatch2Internal::createDirectory(_serverDir + "/data_" + *q);
         }
         sort(knownDirs.begin(), knownDirs.end());
 
         //
         // Remove old directories
         //
-        Ice::StringSeq dirs = IcePatch2Internal::readDirectory(_serverDir + "/service_data");
+        Ice::StringSeq dirs = IcePatch2Internal::readDirectory(_serverDir);
+        Ice::StringSeq svcDirs;
+        for(Ice::StringSeq::const_iterator p = dirs.begin(); p != dirs.end(); ++p)
+        {
+            if(p->find("data_") == 0)
+            {
+                svcDirs.push_back(*p);
+            }
+        }
         Ice::StringSeq toDel;
-        set_difference(dirs.begin(), dirs.end(), knownDirs.begin(), knownDirs.end(), back_inserter(toDel));
+        set_difference(svcDirs.begin(), svcDirs.end(), knownDirs.begin(), knownDirs.end(), back_inserter(toDel));
         for(Ice::StringSeq::const_iterator p = toDel.begin(); p != toDel.end(); ++p)
         {
             try
             {
-                IcePatch2Internal::removeRecursive(_serverDir + "/service_data/" + *p);
+                IcePatch2Internal::removeRecursive(_serverDir + "/" + *p);
             }
             catch(const string& msg)
             {
                 Ice::Warning out(_node->getTraceLevels()->logger);
-                out << "couldn't remove directory `" + _serverDir + "/service_data/" + *p + "':\n" + msg;
+                out << "couldn't remove directory `" + _serverDir + "/" + *p + "':\n" + msg;
             }
         }
     }