Refs #3115. Moved oauth_lib to oauth_api.

git-svn-id: http://code.elgg.org/elgg/trunk@8715 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/oauth_lib/manifest.xml b/mod/oauth_api/manifest.xml
similarity index 82%
rename from mod/oauth_lib/manifest.xml
rename to mod/oauth_api/manifest.xml
index 4f0ae5dc0d02835d3225b30e6250044b8319a266..1d743fdabc1e6494b5dddd53794284b0971972e8 100644 (file)
--- a/mod/oauth_lib/manifest.xml
+++ b/mod/oauth_api/manifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
-       <name>OAuth Libraries</name>
+       <name>OAuth API</name>
        <author>Core developers</author>
        <version>1.8</version>
        <category>bundled</category>
-       <description>OAuth libraries</description>
+       <description>Provides OAuth libraries and API support.</description>
        <website>http://www.elgg.org/</website>
        <copyright>See COPYRIGHT.txt</copyright>
        <license>GNU Public License version 2</license>

diff --git a/mod/oauth_lib/start.php b/mod/oauth_api/start.php
similarity index 87%
rename from mod/oauth_lib/start.php
rename to mod/oauth_api/start.php
index 7830dbe15e30ac70233684128458b4e8a7b67899..d087a13d16ebb50e38ab3841b45069fb6cd670ae 100644 (file)
--- a/mod/oauth_lib/start.php
+++ b/mod/oauth_api/start.php
@@ -1,6 +1,9 @@
 <?php
 /**
- * 
+ * OAuth libs
+ *
+ * @todo Pull these out into an elgg_oauth lib and use elgg_register_library().
+ * @package oauth_api
  */
 
 // require all vendor libraries

diff --git a/mod/oauth_lib/vendors/oauth/LICENSE b/mod/oauth_api/vendors/oauth/LICENSE
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/LICENSE
rename to mod/oauth_api/vendors/oauth/LICENSE

diff --git a/mod/oauth_lib/vendors/oauth/example/server/INSTALL b/mod/oauth_api/vendors/oauth/example/server/INSTALL
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/INSTALL
rename to mod/oauth_api/vendors/oauth/example/server/INSTALL

diff --git a/mod/oauth_lib/vendors/oauth/example/server/core/init.php b/mod/oauth_api/vendors/oauth/example/server/core/init.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/core/init.php
rename to mod/oauth_api/vendors/oauth/example/server/core/init.php

diff --git a/mod/oauth_lib/vendors/oauth/example/server/core/templates/inc/footer.tpl b/mod/oauth_api/vendors/oauth/example/server/core/templates/inc/footer.tpl
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/core/templates/inc/footer.tpl
rename to mod/oauth_api/vendors/oauth/example/server/core/templates/inc/footer.tpl

diff --git a/mod/oauth_lib/vendors/oauth/example/server/core/templates/inc/header.tpl b/mod/oauth_api/vendors/oauth/example/server/core/templates/inc/header.tpl
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/core/templates/inc/header.tpl
rename to mod/oauth_api/vendors/oauth/example/server/core/templates/inc/header.tpl

diff --git a/mod/oauth_lib/vendors/oauth/example/server/core/templates/index.tpl b/mod/oauth_api/vendors/oauth/example/server/core/templates/index.tpl
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/core/templates/index.tpl
rename to mod/oauth_api/vendors/oauth/example/server/core/templates/index.tpl

diff --git a/mod/oauth_lib/vendors/oauth/example/server/core/templates/logon.tpl b/mod/oauth_api/vendors/oauth/example/server/core/templates/logon.tpl
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/core/templates/logon.tpl
rename to mod/oauth_api/vendors/oauth/example/server/core/templates/logon.tpl

diff --git a/mod/oauth_lib/vendors/oauth/example/server/core/templates/register.tpl b/mod/oauth_api/vendors/oauth/example/server/core/templates/register.tpl
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/core/templates/register.tpl
rename to mod/oauth_api/vendors/oauth/example/server/core/templates/register.tpl

diff --git a/mod/oauth_lib/vendors/oauth/example/server/www/hello.php b/mod/oauth_api/vendors/oauth/example/server/www/hello.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/www/hello.php
rename to mod/oauth_api/vendors/oauth/example/server/www/hello.php

diff --git a/mod/oauth_lib/vendors/oauth/example/server/www/index.php b/mod/oauth_api/vendors/oauth/example/server/www/index.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/www/index.php
rename to mod/oauth_api/vendors/oauth/example/server/www/index.php

diff --git a/mod/oauth_lib/vendors/oauth/example/server/www/logon.php b/mod/oauth_api/vendors/oauth/example/server/www/logon.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/www/logon.php
rename to mod/oauth_api/vendors/oauth/example/server/www/logon.php

diff --git a/mod/oauth_lib/vendors/oauth/example/server/www/oauth.php b/mod/oauth_api/vendors/oauth/example/server/www/oauth.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/www/oauth.php
rename to mod/oauth_api/vendors/oauth/example/server/www/oauth.php

diff --git a/mod/oauth_lib/vendors/oauth/example/server/www/register.php b/mod/oauth_api/vendors/oauth/example/server/www/register.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/www/register.php
rename to mod/oauth_api/vendors/oauth/example/server/www/register.php

diff --git a/mod/oauth_lib/vendors/oauth/example/server/www/services.xrds.php b/mod/oauth_api/vendors/oauth/example/server/www/services.xrds.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/example/server/www/services.xrds.php
rename to mod/oauth_api/vendors/oauth/example/server/www/services.xrds.php

diff --git a/mod/oauth_lib/vendors/oauth/library/OAuthDiscovery.php b/mod/oauth_api/vendors/oauth/library/OAuthDiscovery.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/OAuthDiscovery.php
rename to mod/oauth_api/vendors/oauth/library/OAuthDiscovery.php

diff --git a/mod/oauth_lib/vendors/oauth/library/OAuthException.php b/mod/oauth_api/vendors/oauth/library/OAuthException.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/OAuthException.php
rename to mod/oauth_api/vendors/oauth/library/OAuthException.php

diff --git a/mod/oauth_lib/vendors/oauth/library/OAuthRequest.php b/mod/oauth_api/vendors/oauth/library/OAuthRequest.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/OAuthRequest.php
rename to mod/oauth_api/vendors/oauth/library/OAuthRequest.php

diff --git a/mod/oauth_lib/vendors/oauth/library/OAuthRequestLogger.php b/mod/oauth_api/vendors/oauth/library/OAuthRequestLogger.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/OAuthRequestLogger.php
rename to mod/oauth_api/vendors/oauth/library/OAuthRequestLogger.php

diff --git a/mod/oauth_lib/vendors/oauth/library/OAuthRequestSigner.php b/mod/oauth_api/vendors/oauth/library/OAuthRequestSigner.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/OAuthRequestSigner.php
rename to mod/oauth_api/vendors/oauth/library/OAuthRequestSigner.php

diff --git a/mod/oauth_lib/vendors/oauth/library/OAuthRequestVerifier.php b/mod/oauth_api/vendors/oauth/library/OAuthRequestVerifier.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/OAuthRequestVerifier.php
rename to mod/oauth_api/vendors/oauth/library/OAuthRequestVerifier.php

diff --git a/mod/oauth_lib/vendors/oauth/library/OAuthRequester.php b/mod/oauth_api/vendors/oauth/library/OAuthRequester.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/OAuthRequester.php
rename to mod/oauth_api/vendors/oauth/library/OAuthRequester.php

diff --git a/mod/oauth_lib/vendors/oauth/library/OAuthServer.php b/mod/oauth_api/vendors/oauth/library/OAuthServer.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/OAuthServer.php
rename to mod/oauth_api/vendors/oauth/library/OAuthServer.php

diff --git a/mod/oauth_lib/vendors/oauth/library/OAuthStore.php b/mod/oauth_api/vendors/oauth/library/OAuthStore.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/OAuthStore.php
rename to mod/oauth_api/vendors/oauth/library/OAuthStore.php

diff --git a/mod/oauth_lib/vendors/oauth/library/body/OAuthBodyContentDisposition.php b/mod/oauth_api/vendors/oauth/library/body/OAuthBodyContentDisposition.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/body/OAuthBodyContentDisposition.php
rename to mod/oauth_api/vendors/oauth/library/body/OAuthBodyContentDisposition.php

diff --git a/mod/oauth_lib/vendors/oauth/library/body/OAuthBodyMultipartFormdata.php b/mod/oauth_api/vendors/oauth/library/body/OAuthBodyMultipartFormdata.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/body/OAuthBodyMultipartFormdata.php
rename to mod/oauth_api/vendors/oauth/library/body/OAuthBodyMultipartFormdata.php

diff --git a/mod/oauth_lib/vendors/oauth/library/discovery/xrds_parse.php b/mod/oauth_api/vendors/oauth/library/discovery/xrds_parse.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/discovery/xrds_parse.php
rename to mod/oauth_api/vendors/oauth/library/discovery/xrds_parse.php

diff --git a/mod/oauth_lib/vendors/oauth/library/discovery/xrds_parse.txt b/mod/oauth_api/vendors/oauth/library/discovery/xrds_parse.txt
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/discovery/xrds_parse.txt
rename to mod/oauth_api/vendors/oauth/library/discovery/xrds_parse.txt

diff --git a/mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod.class.php b/mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod.class.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod.class.php
rename to mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod.class.php

diff --git a/mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_HMAC_SHA1.php b/mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod_HMAC_SHA1.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_HMAC_SHA1.php
rename to mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod_HMAC_SHA1.php

diff --git a/mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_MD5.php b/mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod_MD5.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_MD5.php
rename to mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod_MD5.php

diff --git a/mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_PLAINTEXT.php b/mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod_PLAINTEXT.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_PLAINTEXT.php
rename to mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod_PLAINTEXT.php

diff --git a/mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_RSA_SHA1.php b/mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod_RSA_SHA1.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_RSA_SHA1.php
rename to mod/oauth_api/vendors/oauth/library/signature_method/OAuthSignatureMethod_RSA_SHA1.php

diff --git a/mod/oauth_lib/vendors/oauth/library/store/OAuthStoreAbstract.class.php b/mod/oauth_api/vendors/oauth/library/store/OAuthStoreAbstract.class.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/store/OAuthStoreAbstract.class.php
rename to mod/oauth_api/vendors/oauth/library/store/OAuthStoreAbstract.class.php

diff --git a/mod/oauth_lib/vendors/oauth/library/store/OAuthStoreAnyMeta.php b/mod/oauth_api/vendors/oauth/library/store/OAuthStoreAnyMeta.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/store/OAuthStoreAnyMeta.php
rename to mod/oauth_api/vendors/oauth/library/store/OAuthStoreAnyMeta.php

diff --git a/mod/oauth_lib/vendors/oauth/library/store/OAuthStoreMySQL.php b/mod/oauth_api/vendors/oauth/library/store/OAuthStoreMySQL.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/store/OAuthStoreMySQL.php
rename to mod/oauth_api/vendors/oauth/library/store/OAuthStoreMySQL.php

diff --git a/mod/oauth_lib/vendors/oauth/library/store/mysql/install.php b/mod/oauth_api/vendors/oauth/library/store/mysql/install.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/store/mysql/install.php
rename to mod/oauth_api/vendors/oauth/library/store/mysql/install.php

diff --git a/mod/oauth_lib/vendors/oauth/library/store/mysql/mysql.sql b/mod/oauth_api/vendors/oauth/library/store/mysql/mysql.sql
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/library/store/mysql/mysql.sql
rename to mod/oauth_api/vendors/oauth/library/store/mysql/mysql.sql

diff --git a/mod/oauth_lib/vendors/oauth/test/discovery/xrds-fireeagle.xrds b/mod/oauth_api/vendors/oauth/test/discovery/xrds-fireeagle.xrds
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/test/discovery/xrds-fireeagle.xrds
rename to mod/oauth_api/vendors/oauth/test/discovery/xrds-fireeagle.xrds

diff --git a/mod/oauth_lib/vendors/oauth/test/discovery/xrds-getsatisfaction.xrds b/mod/oauth_api/vendors/oauth/test/discovery/xrds-getsatisfaction.xrds
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/test/discovery/xrds-getsatisfaction.xrds
rename to mod/oauth_api/vendors/oauth/test/discovery/xrds-getsatisfaction.xrds

diff --git a/mod/oauth_lib/vendors/oauth/test/discovery/xrds-magnolia.xrds b/mod/oauth_api/vendors/oauth/test/discovery/xrds-magnolia.xrds
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/test/discovery/xrds-magnolia.xrds
rename to mod/oauth_api/vendors/oauth/test/discovery/xrds-magnolia.xrds

diff --git a/mod/oauth_lib/vendors/oauth/test/oauth_test.php b/mod/oauth_api/vendors/oauth/test/oauth_test.php
similarity index 100%
rename from mod/oauth_lib/vendors/oauth/test/oauth_test.php
rename to mod/oauth_api/vendors/oauth/test/oauth_test.php

diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index fc0aa44c5a6d2507048dbb893304e05d766d8912..28af93328a9b8b7d02dded9f9551c2aebd271b0d 100644 (file)
--- a/mod/twitter_api/manifest.xml
+++ b/mod/twitter_api/manifest.xml
@@ -15,7 +15,7 @@
        </requires>
        <requires>
                <type>plugin</type>
-               <name>oauth_lib</name>
+               <name>oauth_api</name>
        </requires>
        <requires>
                <type>php_extension</type>