[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-32-g066e82f

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  066e82ff008c457d753dc1ce1daca163171a0e12 (commit)
       via  bf62e96921a9cb1c388d4fab05ef569206d6316e (commit)
       via  4dc0e9aa4cd67638a98a9bd2a9f883824fa4dfe9 (commit)
      from  25728f32a6796809de6bb8508f25de8e3b3e2242 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 066e82ff008c457d753dc1ce1daca163171a0e12
Author: Giuseppe Scrivano <address@hidden>
Date:   Tue Feb 23 16:18:25 2010 +0100

    Use the plugin info specified in the `plugin.xml' file.

diff --git a/myserver/src/plugin/plugins_manager.cpp 
b/myserver/src/plugin/plugins_manager.cpp
index 9c482ca..038c681 100644
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -281,7 +281,13 @@ PluginsManager::quickLoad (Server *server, const string 
&plugins)
                                     ? string::npos
                                     : commaPos - sep - 1);
 
-      PluginInfo *pinfo = new PluginInfo (name);
+      string dir;
+      string filename;
+      FilesUtility::splitPath (file, dir, filename);
+
+      string xmlDescriptor = dir + "/plugin.xml";
+      PluginInfo *pinfo = loadInfo (server, name, xmlDescriptor);
+
       auto_ptr<PluginInfo> pinfoAutoPtr (pinfo);
 
       ret |= loadFile (server, name, file, pinfo);



commit bf62e96921a9cb1c388d4fab05ef569206d6316e
Author: Giuseppe Scrivano <address@hidden>
Date:   Tue Feb 23 15:20:26 2010 +0100

    Bump the plugins max-version attribute.

diff --git a/plugins/src/http_checker/plugin.xml 
b/plugins/src/http_checker/plugin.xml
index 6f17e11..dd88423 100644
--- a/plugins/src/http_checker/plugin.xml
+++ b/plugins/src/http_checker/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<PLUGIN min-version="0.9" max-version="0.9">
+<PLUGIN min-version="0.9" max-version="0.10">
 <NAME>http_checker</NAME>
 <VERSION>0.1</VERSION>
 <AUTHOR>The Free Software Foundation Inc.</AUTHOR>
diff --git a/plugins/src/mime_magic/plugin.xml 
b/plugins/src/mime_magic/plugin.xml
index 9b6c606..805b6f2 100755
--- a/plugins/src/mime_magic/plugin.xml
+++ b/plugins/src/mime_magic/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<PLUGIN min-version="0.9" max-version="0.9">
+<PLUGIN min-version="0.9" max-version="0.10">
        <NAME>mime_magic</NAME>
        <VERSION>0.1</VERSION>
        <AUTHOR>The Free Software Foundation Inc.</AUTHOR>
diff --git a/plugins/src/python/plugin.xml b/plugins/src/python/plugin.xml
index ae4ac0b..3cec600 100644
--- a/plugins/src/python/plugin.xml
+++ b/plugins/src/python/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<PLUGIN min-version="0.9" max-version="0.9">
+<PLUGIN min-version="0.9" max-version="0.10">
 <NAME>python</NAME>
 <VERSION>0.1</VERSION>
 <AUTHOR>The MyServer Team</AUTHOR>
diff --git a/plugins/src/python_http_handler/plugin.xml 
b/plugins/src/python_http_handler/plugin.xml
index 9fbfbc5..08cf3d3 100644
--- a/plugins/src/python_http_handler/plugin.xml
+++ b/plugins/src/python_http_handler/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<PLUGIN min-version="0.9" max-version="0.9">
+<PLUGIN min-version="0.9" max-version="0.10">
 <NAME>python_http_handler</NAME>
 <VERSION>0.1</VERSION>
 <AUTHOR>The Free Software Foundation Inc.</AUTHOR>
diff --git a/plugins/src/rules_checker/plugin.xml 
b/plugins/src/rules_checker/plugin.xml
index 0912e18..fa398c3 100644
--- a/plugins/src/rules_checker/plugin.xml
+++ b/plugins/src/rules_checker/plugin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<PLUGIN min-version="0.9" max-version="0.9">
+<PLUGIN min-version="0.9" max-version="0.10">
 <NAME>rules_checker</NAME>
 <VERSION>0.1</VERSION>
 <AUTHOR>The Free Software Foundation Inc.</AUTHOR>



commit 4dc0e9aa4cd67638a98a9bd2a9f883824fa4dfe9
Author: Giuseppe Scrivano <address@hidden>
Date:   Tue Feb 23 15:15:52 2010 +0100

    Avoid to preLoad plugins twice.

diff --git a/myserver/src/plugin/plugins_manager.cpp 
b/myserver/src/plugin/plugins_manager.cpp
index 9cdd8e5..9c482ca 100644
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -288,7 +288,7 @@ PluginsManager::quickLoad (Server *server, const string 
&plugins)
 
       pinfoAutoPtr.release ();
 
-      Plugin *plugin = preLoadPlugin (file, server, true);
+      Plugin *plugin = pinfo->getPlugin ();
       if (! plugin)
         {
           server->log (MYSERVER_LOG_MSG_ERROR,
@@ -296,9 +296,6 @@ PluginsManager::quickLoad (Server *server, const string 
&plugins)
           return -1;
         }
 
-      pinfo->setPlugin (plugin);
-      addPluginInfo (name, pinfo);
-
       ret |= plugin->load (server);
       ret |= plugin->postLoad (server);
 

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/plugin/plugins_manager.cpp    |   13 ++++++++-----
 plugins/src/http_checker/plugin.xml        |    2 +-
 plugins/src/mime_magic/plugin.xml          |    2 +-
 plugins/src/python/plugin.xml              |    2 +-
 plugins/src/python_http_handler/plugin.xml |    2 +-
 plugins/src/rules_checker/plugin.xml       |    2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU MyServer