Update ice file locations

source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h

@@ -31,8 +31,8 @@
 #include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
 
 // RobotAPI
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
 #include <RobotAPI/libraries/armem/client/ComponentPlugin.h>
 #include <RobotAPI/libraries/armem/core/Memory.h>
 

source/RobotAPI/components/armem/ArMemMemoryNameSystem/ArMemMemoryNameSystem.h

@@ -29,7 +29,7 @@
 #include <ArmarXGui/libraries/ArmarXGuiComponentPlugins/LightweightRemoteGuiComponentPlugin.h>
 // #include <RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.h>
 
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
 
 #include <RobotAPI/libraries/armem/mns/ComponentPlugin.h>
 
@@ -73,7 +73,7 @@ namespace armarx
         std::string getDefaultName() const override;
 
 
-        // MemoryNameSystemInterface interface
+        // mns::MemoryNameSystemInterface interface
     public:
         armem::data::RegisterMemoryResult registerMemory(const armem::data::RegisterMemoryInput& input, const Ice::Current&) override;
         armem::data::RemoveMemoryResult removeMemory(const armem::data::RemoveMemoryInput& input, const Ice::Current&) override;

source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h

@@ -32,7 +32,7 @@
 
 #include <ArmarXCore/core/system/ImportExportComponent.h>
 
-#include <RobotAPI/interface/armem/MemoryInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
 #include <RobotAPI/libraries/armem/client/Reader.h>
 #include <RobotAPI/libraries/armem_gui/InstanceTreeWidget.h>
 #include <RobotAPI/libraries/armem_gui/MemoryTreeWidget.h>

source/RobotAPI/interface/CMakeLists.txt

@@ -102,16 +102,23 @@ set(SLICE_FILES
     aron.ice
     aron/Aron.ice
 
-    armem.ice
-    armem/ReadingMemoryInterface.ice
-    armem/WritingMemoryInterface.ice
-    armem/MemoryInterface.ice
-    armem/MemoryListenerInterface.ice
-    armem/MemoryNameSystemInterface.ice
 
-    armem/query.ice
-    armem/memory.ice
+    armem.ice
     armem/commit.ice
+    armem/memory.ice
+    armem/query.ice
+
+    armem/client.ice
+    armem/client/MemoryListenerInterface.ice
+
+    armem/server.ice
+    armem/server/MemoryInterface.ice
+    armem/server/ReadingMemoryInterface.ice
+    armem/server/WritingMemoryInterface.ice
+
+    armem/mns.ice
+    armem/mns/MemoryNameSystemInterface.ice
+
 
     components/ObstacleAvoidance/ObstacleAvoidanceInterface.ice
     components/ObstacleAvoidance/ObstacleDetectionInterface.ice

source/RobotAPI/interface/armem.ice

 #pragma once
 
-#include <RobotAPI/interface/armem/ReadingMemoryInterface.ice>
-#include <RobotAPI/interface/armem/WritingMemoryInterface.ice>
-#include <RobotAPI/interface/armem/MemoryInterface.ice>
-#include <RobotAPI/interface/armem/MemoryListenerInterface.ice>
+#include <RobotAPI/interface/armem/client.ice>
+#include <RobotAPI/interface/armem/commit.ice>
+#include <RobotAPI/interface/armem/memory.ice>
+#include <RobotAPI/interface/armem/query.ice>
+#include <RobotAPI/interface/armem/server.ice>
+#include <RobotAPI/interface/armem/MemoryNameSystemInterface.ice>
 
 
 module armarx

source/RobotAPI/interface/armem/client.ice

+#pragma once
+
+#include <RobotAPI/interface/armem/client/MemoryListenerInterface.ice>

source/RobotAPI/interface/armem/mns.ice

+#pragma once
+
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.ice>

source/RobotAPI/interface/armem/MemoryNameSystemInterface.ice → source/RobotAPI/interface/armem/mns/MemoryNameSystemInterface.ice

 #pragma once
 
-#include <RobotAPI/interface/armem/MemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/MemoryInterface.ice>
 
 
 module armarx
@@ -59,17 +59,20 @@ module armarx
 
                 server::MemoryInterface* proxy;
             };
-        }
+        };
 
 
-        interface MemoryNameSystemInterface
+        module mns
         {
-            data::RegisterMemoryResult registerMemory(data::RegisterMemoryInput input);
-            data::RemoveMemoryResult removeMemory(data::RemoveMemoryInput input);
+            interface MemoryNameSystemInterface
+            {
+                data::RegisterMemoryResult registerMemory(data::RegisterMemoryInput input);
+                data::RemoveMemoryResult removeMemory(data::RemoveMemoryInput input);
 
-            data::ResolveMemoryNameResult resolveMemoryName(data::ResolveMemoryNameInput input);
-            data::WaitForMemoryResult waitForMemory(data::WaitForMemoryInput input);
-        };
+                data::ResolveMemoryNameResult resolveMemoryName(data::ResolveMemoryNameInput input);
+                data::WaitForMemoryResult waitForMemory(data::WaitForMemoryInput input);
+            };
+        }
 
     };
 };

source/RobotAPI/interface/armem/server.ice

+#pragma once
+
+#include <RobotAPI/interface/armem/server/MemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/WritingMemoryInterface.ice>

source/RobotAPI/interface/armem/MemoryInterface.ice → source/RobotAPI/interface/armem/server/MemoryInterface.ice

 #pragma once
 
-#include <RobotAPI/interface/armem/ReadingMemoryInterface.ice>
-#include <RobotAPI/interface/armem/WritingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.ice>
+#include <RobotAPI/interface/armem/server/WritingMemoryInterface.ice>
 
 
 module armarx

source/RobotAPI/libraries/armem/client/ComponentPlugin.h

@@ -5,7 +5,7 @@
 #include <ArmarXCore/core/Component.h>
 
 // RobotAPI
-#include <RobotAPI/interface/armem/MemoryInterface.h>
+#include <RobotAPI/interface/armem/server/MemoryInterface.h>
 #include <RobotAPI/libraries/armem/client/ReaderComponentPlugin.h>
 #include <RobotAPI/libraries/armem/client/WriterComponentPlugin.h>
 

source/RobotAPI/libraries/armem/client/Reader.h

@@ -7,8 +7,8 @@
 #include <vector>
 
 // RobotAPI
-#include <RobotAPI/interface/armem/ReadingMemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryListenerInterface.h>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
+#include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
 #include <RobotAPI/libraries/armem/core/ice_conversions.h>
 #include <RobotAPI/libraries/armem/core/Memory.h>
 

source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h

@@ -8,9 +8,10 @@
 #include <ArmarXCore/core/Component.h>
 
 // RobotAPI
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryListenerInterface.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/ReadingMemoryInterface.h>
+#include <RobotAPI/interface/armem/client/MemoryListenerInterface.h>
+
 #include <RobotAPI/libraries/armem/client/Reader.h>
 #include <RobotAPI/libraries/armem/mns/ClientPlugin.h>
 

source/RobotAPI/libraries/armem/client/Writer.h

 #pragma once
 
-#include <RobotAPI/interface/armem/WritingMemoryInterface.h>
+#include <RobotAPI/interface/armem/server/WritingMemoryInterface.h>
 
 #include <RobotAPI/libraries/armem/core/ice_conversions.h>
 

source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h

@@ -5,8 +5,9 @@
 #include <ArmarXCore/core/Component.h>
 
 // RobotAPI
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/MemoryNameSystemInterface.h>
+#include <RobotAPI/interface/armem/server/WritingMemoryInterface.h>
+#include <RobotAPI/interface/armem/mns/MemoryNameSystemInterface.h>
+
 #include <RobotAPI/libraries/armem/client/Writer.h>
 #include <RobotAPI/libraries/armem/mns/ClientPlugin.h>
 

source/RobotAPI/libraries/armem/core/ice_conversions.h

@@ -2,9 +2,8 @@
 
 #include <memory>
 
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-#include <RobotAPI/interface/armem/memory.h>
 #include <RobotAPI/interface/armem/commit.h>
+#include <RobotAPI/interface/armem/memory.h>
 
 #include "ice_conversions_templates.h"
 

source/RobotAPI/libraries/armem/core/ice_conversions_templates.h

@@ -2,8 +2,6 @@
 
 #include <memory>
 
-#include <RobotAPI/interface/armem/MemoryInterface.h>
-
 #include "Commit.h"