diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-12 19:57:39 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-12 19:57:39 +0000 |
| commit | 896a57156e01406bbf3bb8ee2b4c84a9cad8d10c (patch) | |
| tree | 183b3f15307de98d72431ebde75926c1b6318117 | |
| parent | 606b7b6a101bf109817567b1a2b0a7e831768766 (diff) | |
| download | elgg-896a57156e01406bbf3bb8ee2b4c84a9cad8d10c.tar.gz elgg-896a57156e01406bbf3bb8ee2b4c84a9cad8d10c.tar.bz2 | |
Refs #2898: Using an XML namespace instead of version attribute on plugin manifests.
git-svn-id: http://code.elgg.org/elgg/trunk@8170 36083f99-b078-4883-b0ff-0f9b5a30f544
32 files changed, 46 insertions, 37 deletions
diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php index fcd0094c4..e230cd3f2 100644 --- a/engine/classes/ElggPluginManifest.php +++ b/engine/classes/ElggPluginManifest.php @@ -8,8 +8,8 @@ * as $this->parser. * * To add new parser versions, name them ElggPluginManifestParserXX - * where XX is the version specified in the top-level <plugin-manifest> - * tag. + * where XX is the version specified in the top-level <plugin_manifest> + * tag's XML namespace. * * @package Elgg.Core * @subpackage Plugins @@ -23,6 +23,12 @@ class ElggPluginManifest { protected $parser; /** + * The root for plugin manifest namespaces. + * This is in the format http://www.elgg.org/plugin_manifest/<version> + */ + protected $namespace_root = 'http://www.elgg.org/plugin_manifest/'; + + /** * The expected structure of a plugins requires element */ private $depsStructPlugin = array( @@ -144,12 +150,15 @@ class ElggPluginManifest { } // set manifest api version - if (isset($manifest_obj->attributes['version'])) { - $this->apiVersion = (float)$manifest_obj->attributes['version']; + if (isset($manifest_obj->attributes['xmlns'])) { + $namespace = $manifest_obj->attributes['xmlns']; + $version = str_replace($this->namespace_root, '', $namespace); } else { - $this->apiVersion = 1.7; + $version = 1.7; } + $this->apiVersion = $version; + $parser_class_name = 'ElggPluginManifestParser' . str_replace('.', '', $this->apiVersion); // @todo currently the autoloader freaks out if a class doesn't exist. diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml index 2712b1ed9..4d84e25b2 100644 --- a/mod/blog/manifest.xml +++ b/mod/blog/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Blog</name> <author>Curverider</author> <version>1.8</version> diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml index 76bb5e54b..82deaf5b4 100644 --- a/mod/bookmarks/manifest.xml +++ b/mod/bookmarks/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Bookmarks</name> <author>Curverider</author> <version>1.7</version> diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml index 86ac985e7..cc4e339ce 100644 --- a/mod/categories/manifest.xml +++ b/mod/categories/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Site-wide Categories</name> <author>Curverider</author> <version>1.7</version> diff --git a/mod/defaultwidgets/manifest.xml b/mod/defaultwidgets/manifest.xml index f5860882e..bb3e4332c 100644 --- a/mod/defaultwidgets/manifest.xml +++ b/mod/defaultwidgets/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Default Widgets</name> <author>Milan Magudia & Curverider</author> <version>2.04</version> diff --git a/mod/developers/manifest.xml b/mod/developers/manifest.xml index ed5aadd62..407c65bf1 100644 --- a/mod/developers/manifest.xml +++ b/mod/developers/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Elgg Developer Tools</name> <author>Cash Costello</author> <version>1.0</version> diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml index 2a006adcf..194306f7b 100644 --- a/mod/diagnostics/manifest.xml +++ b/mod/diagnostics/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Diagnostics</name> <author>Curverider Ltd</author> <version>1.5</version> diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml index 866516e25..aeb85430a 100644 --- a/mod/embed/manifest.xml +++ b/mod/embed/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Embed</name> <author>Curverider</author> <version>1.8</version> diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml index 3a10dbf68..545e40905 100644 --- a/mod/file/manifest.xml +++ b/mod/file/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>File</name> <author>Curverider</author> <version>1.8</version> diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml index 6d6e370b4..a9135321d 100644 --- a/mod/garbagecollector/manifest.xml +++ b/mod/garbagecollector/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Garbage Collector</name> <author>Curverider ltd</author> <version>1.5</version> diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml index f5f43acf7..ce079b18f 100644 --- a/mod/groups/manifest.xml +++ b/mod/groups/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Groups</name> <author>Curverider ltd</author> <version>1.8</version> diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml index 50f18f938..2168619fb 100644 --- a/mod/htmlawed/manifest.xml +++ b/mod/htmlawed/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>HTMLawed</name> <author>Curverider Ltd</author> <version>1.5</version> diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml index 647caaf05..adb8832e6 100644 --- a/mod/invitefriends/manifest.xml +++ b/mod/invitefriends/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Invite Friends</name> <author>Curverider</author> <version>1.7</version> diff --git a/mod/logbrowser/manifest.xml b/mod/logbrowser/manifest.xml index d96f01579..7898092b5 100644 --- a/mod/logbrowser/manifest.xml +++ b/mod/logbrowser/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Log Browser</name> <author>Curverider Ltd</author> <version>1.5</version> diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml index 0b974f77a..a54095149 100644 --- a/mod/logrotate/manifest.xml +++ b/mod/logrotate/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Log Rotate</name> <author>Curverider Ltd</author> <version>1.5</version> diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml index d3a5d6498..c29acbd4f 100644 --- a/mod/messageboard/manifest.xml +++ b/mod/messageboard/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Message Board</name> <author>Curverider</author> <version>1.7</version> diff --git a/mod/messages/manifest.xml b/mod/messages/manifest.xml index 1e0eb4670..35377cc5f 100644 --- a/mod/messages/manifest.xml +++ b/mod/messages/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Messages</name> <author>Curverider?</author> <version>1.8</version> diff --git a/mod/minify/manifest.xml b/mod/minify/manifest.xml index 0ae6dde24..bdf815b8b 100644 --- a/mod/minify/manifest.xml +++ b/mod/minify/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Minify</name> <author>Evan Winslow</author> <version>0.2</version> @@ -10,4 +10,4 @@ <type>elgg_release</type> <version>1.7</version> </requires> -</plugin_manifest>
\ No newline at end of file +</plugin_manifest> diff --git a/mod/notifications/manifest.xml b/mod/notifications/manifest.xml index 6e1d82517..a7d197937 100644 --- a/mod/notifications/manifest.xml +++ b/mod/notifications/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Notifications</name> <author>Curverider</author> <version>1.7</version> diff --git a/mod/oauth_lib/manifest.xml b/mod/oauth_lib/manifest.xml index 76b2bfecc..c91f5c168 100644 --- a/mod/oauth_lib/manifest.xml +++ b/mod/oauth_lib/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>OAuth Libraries</name> <author>Curverider</author> <version>1.8</version> diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml index 63c12d865..fdd9af2d6 100644 --- a/mod/pages/manifest.xml +++ b/mod/pages/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Pages</name> <author>Curverider</author> <version>1.8</version> diff --git a/mod/profile/manifest.xml b/mod/profile/manifest.xml index c9bbe703b..ac0b5a444 100644 --- a/mod/profile/manifest.xml +++ b/mod/profile/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Profile</name> <description>The default profile plugin.</description> <author>Elgg.org</author> diff --git a/mod/reportedcontent/manifest.xml b/mod/reportedcontent/manifest.xml index 6eb994aa5..2f37c5bfe 100644 --- a/mod/reportedcontent/manifest.xml +++ b/mod/reportedcontent/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Reported Content</name> <author>Curverider</author> <version>1.7</version> diff --git a/mod/search/manifest.xml b/mod/search/manifest.xml index df1fe2010..a9b50af17 100644 --- a/mod/search/manifest.xml +++ b/mod/search/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Search</name> <author>Curverider Ltd, The MITRE Corporation</author> <version>1.8</version> diff --git a/mod/sitepages/manifest.xml b/mod/sitepages/manifest.xml index ae4c5d8dc..86b6e92f7 100644 --- a/mod/sitepages/manifest.xml +++ b/mod/sitepages/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Site Pages</name> <author>Curverider</author> <version>1.8</version> diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml index 3103a5477..a49e8ff62 100644 --- a/mod/tagcloud/manifest.xml +++ b/mod/tagcloud/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Tag Cloud</name> <author>Cash Costello</author> <version>1.0</version> diff --git a/mod/thewire/manifest.xml b/mod/thewire/manifest.xml index d62884ea0..563b28152 100644 --- a/mod/thewire/manifest.xml +++ b/mod/thewire/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>The Wire</name> <author>Curverider</author> <version>1.8</version> diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml index b7fc2ae1a..0eeab71eb 100644 --- a/mod/tinymce/manifest.xml +++ b/mod/tinymce/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>TinyMCE</name> <author>Curverider</author> <version>1.8</version> diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml index 7c2102106..f6c4f3984 100644 --- a/mod/twitter/manifest.xml +++ b/mod/twitter/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Twitter</name> <author>Curverider</author> <version>1.7</version> diff --git a/mod/twitterservice/manifest.xml b/mod/twitterservice/manifest.xml index 737512ecf..993cef1d8 100644 --- a/mod/twitterservice/manifest.xml +++ b/mod/twitterservice/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Twitter Services</name> <author>Curverider</author> <version>1.8</version> diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml index 164cab547..d7fbdbe7e 100644 --- a/mod/uservalidationbyemail/manifest.xml +++ b/mod/uservalidationbyemail/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>User Validation by Email</name> <author>Curverider Ltd</author> <version>1.7</version> diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml index 78fc69057..80a703bf2 100644 --- a/mod/zaudio/manifest.xml +++ b/mod/zaudio/manifest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest version="1.8"> +<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> <name>Zaudio</name> <author>Curverider</author> <version>1.8</version> |