Refs #3115. Moved oauth_lib to oauth_api.

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

44 files changed, 7 insertions, 4 deletions

diff --git a/mod/oauth_lib/manifest.xml b/mod/oauth_api/manifest.xml
index 4f0ae5dc0..1d743fdab 100644
--- 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
index 7830dbe15..d087a13d1 100644
--- 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
index f64bcd50f..f64bcd50f 100644
--- a/mod/oauth_lib/vendors/oauth/LICENSE
+++ b/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
index 249c85e9d..249c85e9d 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/INSTALL
+++ b/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
index e5bb9de35..e5bb9de35 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/core/init.php
+++ b/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
index 308b1d01b..308b1d01b 100644
--- 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
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
index 5046f54b0..5046f54b0 100644
--- 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
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
index 7b065537d..7b065537d 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/core/templates/index.tpl
+++ b/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
index 5ccd432b5..5ccd432b5 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/core/templates/logon.tpl
+++ b/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
index 0e28c1584..0e28c1584 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/core/templates/register.tpl
+++ b/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
index 8cb94bb1e..8cb94bb1e 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/www/hello.php
+++ b/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
index f5cadbe61..f5cadbe61 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/www/index.php
+++ b/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
index 5c937b719..5c937b719 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/www/logon.php
+++ b/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
index e0badcc39..e0badcc39 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/www/oauth.php
+++ b/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
index c5785c2c8..c5785c2c8 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/www/register.php
+++ b/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
index 4c50aa12b..4c50aa12b 100644
--- a/mod/oauth_lib/vendors/oauth/example/server/www/services.xrds.php
+++ b/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
index d097756dd..d097756dd 100644
--- a/mod/oauth_lib/vendors/oauth/library/OAuthDiscovery.php
+++ b/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
index cadd1d032..cadd1d032 100644
--- a/mod/oauth_lib/vendors/oauth/library/OAuthException.php
+++ b/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
index c0d6ddbc7..c0d6ddbc7 100644
--- a/mod/oauth_lib/vendors/oauth/library/OAuthRequest.php
+++ b/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
index 5b88e9d20..5b88e9d20 100644
--- a/mod/oauth_lib/vendors/oauth/library/OAuthRequestLogger.php
+++ b/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
index a33d14034..a33d14034 100644
--- a/mod/oauth_lib/vendors/oauth/library/OAuthRequestSigner.php
+++ b/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
index 5b346b369..5b346b369 100644
--- a/mod/oauth_lib/vendors/oauth/library/OAuthRequestVerifier.php
+++ b/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
index c6f56178e..c6f56178e 100644
--- a/mod/oauth_lib/vendors/oauth/library/OAuthRequester.php
+++ b/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
index d86cc5f14..d86cc5f14 100644
--- a/mod/oauth_lib/vendors/oauth/library/OAuthServer.php
+++ b/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
index 1841ab5fa..1841ab5fa 100644
--- a/mod/oauth_lib/vendors/oauth/library/OAuthStore.php
+++ b/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
index 84123b6d0..84123b6d0 100644
--- a/mod/oauth_lib/vendors/oauth/library/body/OAuthBodyContentDisposition.php
+++ b/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
index 048fdeb63..048fdeb63 100644
--- a/mod/oauth_lib/vendors/oauth/library/body/OAuthBodyMultipartFormdata.php
+++ b/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
index c9cf94997..c9cf94997 100644
--- a/mod/oauth_lib/vendors/oauth/library/discovery/xrds_parse.php
+++ b/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
index fd867ea9f..fd867ea9f 100644
--- a/mod/oauth_lib/vendors/oauth/library/discovery/xrds_parse.txt
+++ b/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
index 34ccb428c..34ccb428c 100644
--- a/mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod.class.php
+++ b/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
index 4bc949c10..4bc949c10 100644
--- 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
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
index 6f593a47f..6f593a47f 100644
--- a/mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_MD5.php
+++ b/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
index 92ef30867..92ef30867 100644
--- a/mod/oauth_lib/vendors/oauth/library/signature_method/OAuthSignatureMethod_PLAINTEXT.php
+++ b/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
index 3bbde7d90..3bbde7d90 100644
--- 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
diff --git a/mod/oauth_lib/vendors/oauth/library/store/OAuthStoreAbstract.class.php b/mod/oauth_api/vendors/oauth/library/store/OAuthStoreAbstract.class.php
index e7cca981a..e7cca981a 100644
--- a/mod/oauth_lib/vendors/oauth/library/store/OAuthStoreAbstract.class.php
+++ b/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
index 9c971733f..9c971733f 100644
--- a/mod/oauth_lib/vendors/oauth/library/store/OAuthStoreAnyMeta.php
+++ b/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
index a1b04c5c8..a1b04c5c8 100644
--- a/mod/oauth_lib/vendors/oauth/library/store/OAuthStoreMySQL.php
+++ b/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
index 0015da5e3..0015da5e3 100644
--- a/mod/oauth_lib/vendors/oauth/library/store/mysql/install.php
+++ b/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
index d652a1c99..d652a1c99 100644
--- a/mod/oauth_lib/vendors/oauth/library/store/mysql/mysql.sql
+++ b/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
index 0f5eba222..0f5eba222 100644
--- a/mod/oauth_lib/vendors/oauth/test/discovery/xrds-fireeagle.xrds
+++ b/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
index ab94b5bea..ab94b5bea 100644
--- a/mod/oauth_lib/vendors/oauth/test/discovery/xrds-getsatisfaction.xrds
+++ b/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
index 361b5c9a1..361b5c9a1 100644
--- a/mod/oauth_lib/vendors/oauth/test/discovery/xrds-magnolia.xrds
+++ b/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
index 0c0504c70..0c0504c70 100644
--- a/mod/oauth_lib/vendors/oauth/test/oauth_test.php
+++ b/mod/oauth_api/vendors/oauth/test/oauth_test.php
diff --git a/mod/twitter_api/manifest.xml b/mod/twitter_api/manifest.xml
index fc0aa44c5..28af93328 100644
--- 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>