# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1410252314 -7200
# Node ID 382e162c074ced6e1bea7ef6684e989cac01803c
# Parent  f739d3f6cfcf32e7849b44a189897a199dbd148f
rename

diff -r f739d3f6cfcf -r 382e162c074c OrthancServer/ServerContext.cpp
--- a/OrthancServer/ServerContext.cpp	Tue Sep 09 10:43:23 2014 +0200
+++ b/OrthancServer/ServerContext.cpp	Tue Sep 09 10:45:14 2014 +0200
@@ -50,7 +50,7 @@
 #include "Scheduler/StoreScuCommand.h"
 #include "Scheduler/StorePeerCommand.h"
 #include "OrthancRestApi/OrthancRestApi.h"
-#include "../Plugins/Engine/PluginsHttpHandler.h"
+#include "../Plugins/Engine/OrthancPlugins.h"
 
 
 #define ENABLE_DICOM_CACHE  1
diff -r f739d3f6cfcf -r 382e162c074c OrthancServer/ServerContext.h
--- a/OrthancServer/ServerContext.h	Tue Sep 09 10:43:23 2014 +0200
+++ b/OrthancServer/ServerContext.h	Tue Sep 09 10:45:14 2014 +0200
@@ -47,7 +47,7 @@
 
 namespace Orthanc
 {
-  class PluginsHttpHandler;
+  class OrthancPlugins;
 
   /**
    * This class is responsible for maintaining the storage area on the
@@ -89,7 +89,7 @@
 
     boost::mutex luaMutex_;
     LuaContext lua_;
-    PluginsHttpHandler* plugins_;  // TODO Turn it into a listener pattern (idem for Lua callbacks)
+    OrthancPlugins* plugins_;  // TODO Turn it into a listener pattern (idem for Lua callbacks)
 
   public:
     class DicomCacheLocker : public boost::noncopyable
@@ -190,9 +190,9 @@
       return scheduler_;
     }
 
-    void SetPluginsHttpHandler(PluginsHttpHandler& plugin)
+    void SetOrthancPlugins(OrthancPlugins& plugins)
     {
-      plugins_ = &plugin;
+      plugins_ = &plugins;
     }
   };
 }
diff -r f739d3f6cfcf -r 382e162c074c Plugins/Engine/OrthancPlugins.cpp
--- a/Plugins/Engine/OrthancPlugins.cpp	Tue Sep 09 10:43:23 2014 +0200
+++ b/Plugins/Engine/OrthancPlugins.cpp	Tue Sep 09 10:45:14 2014 +0200
@@ -30,7 +30,7 @@
  **/
 
 
-#include "PluginsHttpHandler.h"
+#include "OrthancPlugins.h"
 
 #include "../../Core/ChunkedBuffer.h"
 #include "../../Core/OrthancException.h"
@@ -78,7 +78,7 @@
 
 
 
-  struct PluginsHttpHandler::PImpl
+  struct OrthancPlugins::PImpl
   {
     typedef std::pair<boost::regex*, OrthancPluginRestCallback> RestCallback;
     typedef std::list<RestCallback>  RestCallbacks;
@@ -116,13 +116,13 @@
   }
 
 
-  PluginsHttpHandler::PluginsHttpHandler(ServerContext& context)
+  OrthancPlugins::OrthancPlugins(ServerContext& context)
   {
     pimpl_.reset(new PImpl(context));
   }
 
   
-  PluginsHttpHandler::~PluginsHttpHandler()
+  OrthancPlugins::~OrthancPlugins()
   {
     for (PImpl::RestCallbacks::iterator it = pimpl_->restCallbacks_.begin(); 
          it != pimpl_->restCallbacks_.end(); ++it)
@@ -151,7 +151,7 @@
   }
 
 
-  bool PluginsHttpHandler::Handle(HttpOutput& output,
+  bool OrthancPlugins::Handle(HttpOutput& output,
                                   HttpMethod method,
                                   const UriComponents& uri,
                                   const Arguments& headers,
@@ -271,7 +271,7 @@
   }
 
 
-  void PluginsHttpHandler::SignalStoredInstance(DicomInstanceToStore& instance,
+  void OrthancPlugins::SignalStoredInstance(DicomInstanceToStore& instance,
                                                 const std::string& instanceId)                                                  
   {
     for (PImpl::OnStoredCallbacks::const_iterator
@@ -325,7 +325,7 @@
   }
 
 
-  void PluginsHttpHandler::RegisterRestCallback(const void* parameters)
+  void OrthancPlugins::RegisterRestCallback(const void* parameters)
   {
     const _OrthancPluginRestCallback& p = 
       *reinterpret_cast<const _OrthancPluginRestCallback*>(parameters);
@@ -336,7 +336,7 @@
 
 
 
-  void PluginsHttpHandler::RegisterOnStoredInstanceCallback(const void* parameters)
+  void OrthancPlugins::RegisterOnStoredInstanceCallback(const void* parameters)
   {
     const _OrthancPluginOnStoredInstanceCallback& p = 
       *reinterpret_cast<const _OrthancPluginOnStoredInstanceCallback*>(parameters);
@@ -347,7 +347,7 @@
 
 
 
-  void PluginsHttpHandler::AnswerBuffer(const void* parameters)
+  void OrthancPlugins::AnswerBuffer(const void* parameters)
   {
     const _OrthancPluginAnswerBuffer& p = 
       *reinterpret_cast<const _OrthancPluginAnswerBuffer*>(parameters);
@@ -358,7 +358,7 @@
   }
 
 
-  void PluginsHttpHandler::Redirect(const void* parameters)
+  void OrthancPlugins::Redirect(const void* parameters)
   {
     const _OrthancPluginOutputPlusArgument& p = 
       *reinterpret_cast<const _OrthancPluginOutputPlusArgument*>(parameters);
@@ -368,7 +368,7 @@
   }
 
 
-  void PluginsHttpHandler::SendHttpStatusCode(const void* parameters)
+  void OrthancPlugins::SendHttpStatusCode(const void* parameters)
   {
     const _OrthancPluginSendHttpStatusCode& p = 
       *reinterpret_cast<const _OrthancPluginSendHttpStatusCode*>(parameters);
@@ -378,7 +378,7 @@
   }
 
 
-  void PluginsHttpHandler::SendUnauthorized(const void* parameters)
+  void OrthancPlugins::SendUnauthorized(const void* parameters)
   {
     const _OrthancPluginOutputPlusArgument& p = 
       *reinterpret_cast<const _OrthancPluginOutputPlusArgument*>(parameters);
@@ -388,7 +388,7 @@
   }
 
 
-  void PluginsHttpHandler::SendMethodNotAllowed(const void* parameters)
+  void OrthancPlugins::SendMethodNotAllowed(const void* parameters)
   {
     const _OrthancPluginOutputPlusArgument& p = 
       *reinterpret_cast<const _OrthancPluginOutputPlusArgument*>(parameters);
@@ -398,7 +398,7 @@
   }
 
 
-  void PluginsHttpHandler::SetCookie(const void* parameters)
+  void OrthancPlugins::SetCookie(const void* parameters)
   {
     const _OrthancPluginSetCookie& p = 
       *reinterpret_cast<const _OrthancPluginSetCookie*>(parameters);
@@ -408,7 +408,7 @@
   }
 
 
-  void PluginsHttpHandler::CompressAndAnswerPngImage(const void* parameters)
+  void OrthancPlugins::CompressAndAnswerPngImage(const void* parameters)
   {
     const _OrthancPluginCompressAndAnswerPngImage& p = 
       *reinterpret_cast<const _OrthancPluginCompressAndAnswerPngImage*>(parameters);
@@ -454,7 +454,7 @@
   }
 
 
-  void PluginsHttpHandler::GetDicomForInstance(const void* parameters)
+  void OrthancPlugins::GetDicomForInstance(const void* parameters)
   {
     const _OrthancPluginGetDicomForInstance& p = 
       *reinterpret_cast<const _OrthancPluginGetDicomForInstance*>(parameters);
@@ -465,7 +465,7 @@
   }
 
 
-  void PluginsHttpHandler::RestApiGet(const void* parameters)
+  void OrthancPlugins::RestApiGet(const void* parameters)
   {
     const _OrthancPluginRestApiGet& p = 
       *reinterpret_cast<const _OrthancPluginRestApiGet*>(parameters);
@@ -496,7 +496,7 @@
   }
 
 
-  void PluginsHttpHandler::RestApiPostPut(bool isPost, const void* parameters)
+  void OrthancPlugins::RestApiPostPut(bool isPost, const void* parameters)
   {
     const _OrthancPluginRestApiPostPut& p = 
       *reinterpret_cast<const _OrthancPluginRestApiPostPut*>(parameters);
@@ -530,7 +530,7 @@
   }
 
 
-  void PluginsHttpHandler::RestApiDelete(const void* parameters)
+  void OrthancPlugins::RestApiDelete(const void* parameters)
   {
     // The "parameters" point to the URI
     UriComponents uri;
@@ -554,7 +554,7 @@
   }
 
 
-  void PluginsHttpHandler::LookupResource(_OrthancPluginService service,
+  void OrthancPlugins::LookupResource(_OrthancPluginService service,
                                           const void* parameters)
   {
     const _OrthancPluginLookupResource& p = 
@@ -726,7 +726,7 @@
   }
 
 
-  bool PluginsHttpHandler::InvokeService(_OrthancPluginService service,
+  bool OrthancPlugins::InvokeService(_OrthancPluginService service,
                                          const void* parameters)
   {
     switch (service)
@@ -811,7 +811,7 @@
   }
 
 
-  void PluginsHttpHandler::SetOrthancRestApi(OrthancRestApi& restApi)
+  void OrthancPlugins::SetOrthancRestApi(OrthancRestApi& restApi)
   {
     pimpl_->restApi_ = &restApi;
   }
diff -r f739d3f6cfcf -r 382e162c074c Plugins/Engine/OrthancPlugins.h
--- a/Plugins/Engine/OrthancPlugins.h	Tue Sep 09 10:43:23 2014 +0200
+++ b/Plugins/Engine/OrthancPlugins.h	Tue Sep 09 10:45:14 2014 +0200
@@ -43,7 +43,7 @@
 
 namespace Orthanc
 {
-  class PluginsHttpHandler : public HttpHandler, public IPluginServiceProvider
+  class OrthancPlugins : public HttpHandler, public IPluginServiceProvider
   {
   private:
     struct PImpl;
@@ -80,9 +80,9 @@
     void SetCookie(const void* parameters);
 
   public:
-    PluginsHttpHandler(ServerContext& context);
+    OrthancPlugins(ServerContext& context);
 
-    virtual ~PluginsHttpHandler();
+    virtual ~OrthancPlugins();
 
     virtual bool Handle(HttpOutput& output,
                         HttpMethod method,