From 03db967ea616989ae1bac5c2bdb7a2e72d98885e Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 15 Feb 2015 16:26:46 +0000 Subject: Rename configs for uniqueness --- netfs/daemon/Jamfile.jam | 2 +- netfs/daemon/configuration.ice | 34 ---------------------------------- netfs/daemon/daemon.h | 2 +- netfs/daemon/daemonConfig.ice | 34 ++++++++++++++++++++++++++++++++++ netfs/daemon/daemonService.h | 2 +- netfs/fuse/Jamfile.jam | 12 +++++++----- netfs/fuse/configuration.ice | 27 --------------------------- netfs/fuse/fuseApp.h | 2 +- netfs/fuse/fuseConfig.ice | 27 +++++++++++++++++++++++++++ 9 files changed, 72 insertions(+), 70 deletions(-) delete mode 100644 netfs/daemon/configuration.ice create mode 100644 netfs/daemon/daemonConfig.ice delete mode 100644 netfs/fuse/configuration.ice create mode 100644 netfs/fuse/fuseConfig.ice diff --git a/netfs/daemon/Jamfile.jam b/netfs/daemon/Jamfile.jam index 07bdcee..53ac99d 100644 --- a/netfs/daemon/Jamfile.jam +++ b/netfs/daemon/Jamfile.jam @@ -11,7 +11,7 @@ cpp-pch pch : pch.hpp : ; lib netfsdConfiguration : - configuration.ice + daemonConfig.ice : ..//Ice ..//IceUtil diff --git a/netfs/daemon/configuration.ice b/netfs/daemon/configuration.ice deleted file mode 100644 index bb77344..0000000 --- a/netfs/daemon/configuration.ice +++ /dev/null @@ -1,34 +0,0 @@ -module NetFS { - module Daemon { - class Host { - ["slicer:name:endpoint"] - string Endpoint; - }; - - ["slicer:key:hostname","slicer:value:host","slicer:item:host"] - dictionary HostMap; - - class Export { - ["slicer:name:root"] - string RootPath; - }; - - ["slicer:key:name","slicer:value:export","slicer:item:export"] - dictionary ExportMap; - - ["slicer:root:config"] - class Configuration { - ["slicer:name:exports"] - ExportMap Exports; - - ["slicer:name:hosts"] - HostMap Hosts; - }; - - ["slicer:ignore"] - class RuntimeConfiguration { - Configuration CurrentConfiguration; - Host Self; - }; - }; -}; diff --git a/netfs/daemon/daemon.h b/netfs/daemon/daemon.h index 58d9f2f..a43d7cd 100644 --- a/netfs/daemon/daemon.h +++ b/netfs/daemon/daemon.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/netfs/daemon/daemonConfig.ice b/netfs/daemon/daemonConfig.ice new file mode 100644 index 0000000..bb77344 --- /dev/null +++ b/netfs/daemon/daemonConfig.ice @@ -0,0 +1,34 @@ +module NetFS { + module Daemon { + class Host { + ["slicer:name:endpoint"] + string Endpoint; + }; + + ["slicer:key:hostname","slicer:value:host","slicer:item:host"] + dictionary HostMap; + + class Export { + ["slicer:name:root"] + string RootPath; + }; + + ["slicer:key:name","slicer:value:export","slicer:item:export"] + dictionary ExportMap; + + ["slicer:root:config"] + class Configuration { + ["slicer:name:exports"] + ExportMap Exports; + + ["slicer:name:hosts"] + HostMap Hosts; + }; + + ["slicer:ignore"] + class RuntimeConfiguration { + Configuration CurrentConfiguration; + Host Self; + }; + }; +}; diff --git a/netfs/daemon/daemonService.h b/netfs/daemon/daemonService.h index ab52eee..345df2c 100644 --- a/netfs/daemon/daemonService.h +++ b/netfs/daemon/daemonService.h @@ -3,7 +3,7 @@ #include #include -#include +#include class ServiceServer : public NetFS::Service { public: diff --git a/netfs/fuse/Jamfile.jam b/netfs/fuse/Jamfile.jam index acf757d..737c6c8 100644 --- a/netfs/fuse/Jamfile.jam +++ b/netfs/fuse/Jamfile.jam @@ -11,8 +11,8 @@ cpp-pch pch : pch.hpp : ..//Ice ; -obj configuration : - configuration.ice +lib netfsClientConfiguration : + fuseConfig.ice : yes ..//Ice @@ -28,7 +28,7 @@ obj configuration : lib netfsClient : pch - configuration + netfsClientConfiguration [ glob *.cpp : netfs.cpp ] [ glob ../../libfusepp/fuse*.cpp ] : @@ -36,7 +36,8 @@ lib netfsClient : ../../libmisc ../../libfusepp ../ice//netfsComms - configuration + netfsClientConfiguration + netfsClientConfiguration ../ice//netfsComms ../lib//netfsCommon ..//boost_thread @@ -53,7 +54,8 @@ lib netfsClient : ../../libfusepp ../ice//netfsComms ../ice//netfsComms - configuration + netfsClientConfiguration + netfsClientConfiguration _FILE_OFFSET_BITS=64 fuse ; diff --git a/netfs/fuse/configuration.ice b/netfs/fuse/configuration.ice deleted file mode 100644 index db37770..0000000 --- a/netfs/fuse/configuration.ice +++ /dev/null @@ -1,27 +0,0 @@ -module NetFS { - module Client { - ["slicer:element:endpoint"] - sequence EndpointList; - - class Resource { - ["slicer:name:export"] - string ExportName; - - ["slicer:name:service"] - string ServiceIdentity = "Service"; - - ["slicer:name:endpoints"] - EndpointList Endpoints; - }; - - ["slicer:key:name","slicer:value:resource","slicer:item:resource"] - dictionary ResourceMap; - - ["slicer:root:config"] - class Configuration { - ["slicer:name:resources"] - ResourceMap Resources; - }; - }; -}; - diff --git a/netfs/fuse/fuseApp.h b/netfs/fuse/fuseApp.h index f438910..4eb01ff 100644 --- a/netfs/fuse/fuseApp.h +++ b/netfs/fuse/fuseApp.h @@ -5,7 +5,7 @@ #include #include #include "fuseAppBase.h" -#include "configuration.h" +#include "fuseConfig.h" #include "cache.h" namespace NetFS { diff --git a/netfs/fuse/fuseConfig.ice b/netfs/fuse/fuseConfig.ice new file mode 100644 index 0000000..db37770 --- /dev/null +++ b/netfs/fuse/fuseConfig.ice @@ -0,0 +1,27 @@ +module NetFS { + module Client { + ["slicer:element:endpoint"] + sequence EndpointList; + + class Resource { + ["slicer:name:export"] + string ExportName; + + ["slicer:name:service"] + string ServiceIdentity = "Service"; + + ["slicer:name:endpoints"] + EndpointList Endpoints; + }; + + ["slicer:key:name","slicer:value:resource","slicer:item:resource"] + dictionary ResourceMap; + + ["slicer:root:config"] + class Configuration { + ["slicer:name:resources"] + ResourceMap Resources; + }; + }; +}; + -- cgit v1.2.3