evert · sduck · May 14, 2012 · May 14, 2012 · May 14, 2012 · May 14, 2012
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/examples/adexchangebuyer/BaseExample.php b/examples/adexchangebuyer/BaseExample.php
@@ -19,7 +19,7 @@
  * Include the Ad Exchange Buyer service class and the HTML generation
  * functions.
  */
-require_once "../../src/contrib/apiAdexchangebuyerService.php";
+require_once "../../src/Contrib/apiAdexchangebuyerService.php";
 require_once "htmlHelper.php";
 
 /**

diff --git a/examples/adexchangebuyer/index.php b/examples/adexchangebuyer/index.php
@@ -23,7 +23,7 @@
 */
 
 require_once "../../src/apiClient.php";
-require_once "../../src/contrib/apiAdexchangebuyerService.php";
+require_once "../../src/Contrib/apiAdexchangebuyerService.php";
 require_once "htmlHelper.php";
 
 session_start();

diff --git a/examples/adsense/AdSenseAuth.php b/examples/adsense/AdSenseAuth.php
@@ -24,7 +24,7 @@
  * Include the library files for the api client and AdSense service class.
  */
 require_once "../../src/apiClient.php";
-require_once "../../src/contrib/apiAdsenseService.php";
+require_once "../../src/Contrib/apiAdsenseService.php";
 
 /**
  * Handles authentication and OAuth token storing.

diff --git a/examples/adsense/BaseExample.php b/examples/adsense/BaseExample.php
@@ -18,7 +18,7 @@
 /**
  * Include the AdSense service class and the HTML generation functions.
  */
-require_once "../../src/contrib/apiAdsenseService.php";
+require_once "../../src/Contrib/apiAdsenseService.php";
 require_once "htmlHelper.php";
 
 /**

diff --git a/examples/adsensehost/AdSenseAuth.php b/examples/adsensehost/AdSenseAuth.php
@@ -24,7 +24,7 @@
  * Include the library files for the api client and AdSense service class.
  */
 require_once "../../src/apiClient.php";
-require_once "../../src/contrib/apiAdsensehostService.php";
+require_once "../../src/Contrib/apiAdsensehostService.php";
 
 /**
  * Handles authentication and OAuth token storing.

diff --git a/examples/adsensehost/BaseExample.php b/examples/adsensehost/BaseExample.php
@@ -19,7 +19,7 @@
  * Include the libraries file for the AdSense service class and the HTML
  * generation functions.
  */
-require_once "../../src/contrib/apiAdsensehostService.php";
+require_once "../../src/Contrib/apiAdsensehostService.php";
 require_once "htmlHelper.php";
 
 /**

diff --git a/examples/affiliateNetwork/index.php b/examples/affiliateNetwork/index.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiGanService.php';
+require_once '../../src/Contrib/apiGanService.php';
 
 session_start();
 

diff --git a/examples/analytics/simple.php b/examples/analytics/simple.php
@@ -1,6 +1,6 @@
 <?php
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiAnalyticsService.php';
+require_once '../../src/Contrib/AnalyticsService.php';
 session_start();
 
 $client = new apiClient();

diff --git a/examples/apps/index.php b/examples/apps/index.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiGanService.php';
+require_once '../../src/Contrib/apiGanService.php';
 
 session_start();
 

diff --git a/examples/batch.php b/examples/batch.php
@@ -16,7 +16,7 @@
  */
 
 require_once '../src/apiClient.php';
-require_once '../src/contrib/apiPlusService.php';
+require_once '../src/Contrib/apiPlusService.php';
 session_start();
 
 $client = new apiClient();

diff --git a/examples/books/index.php b/examples/books/index.php
@@ -17,7 +17,7 @@
 session_start();
 
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiBooksService.php';
+require_once '../../src/Contrib/apiBooksService.php';
 
 // Include the boilerplate markup.
 include 'interface.html';

diff --git a/examples/books/simple.php b/examples/books/simple.php
@@ -16,7 +16,7 @@
  */
 
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiBooksService.php';
+require_once '../../src/Contrib/apiBooksService.php';
 
 $client = new apiClient();
 $client->setApplicationName("My_Books_API_Example");

diff --git a/examples/calendar/simple.php b/examples/calendar/simple.php
@@ -1,6 +1,6 @@
 <?php
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiCalendarService.php';
+require_once '../../src/Contrib/apiCalendarService.php';
 session_start();
 
 $client = new apiClient();

diff --git a/examples/customSearch/index.php b/examples/customSearch/index.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiCustomsearchService.php';
+require_once '../../src/Contrib/apiCustomsearchService.php';
 session_start();
 
 $client = new apiClient();

diff --git a/examples/latitude/index.php b/examples/latitude/index.php
@@ -17,7 +17,7 @@
 session_start();
 
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiLatitudeService.php';
+require_once '../../src/Contrib/apiLatitudeService.php';
 
 $client = new apiClient();
 // Visit https://code.google.com/apis/console to generate your

diff --git a/examples/pagespeed/index.php b/examples/pagespeed/index.php
@@ -16,7 +16,7 @@
  */
 session_start();
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiPagespeedonlineService.php';
+require_once '../../src/Contrib/apiPagespeedonlineService.php';
 
 $client = new apiClient();
 $client->setApplicationName("PageSpeedOnline_Example_App");

diff --git a/examples/plus/index.php b/examples/plus/index.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiPlusService.php';
+require_once '../../src/Contrib/apiPlusService.php';
 
 session_start();
 

diff --git a/examples/plus/simple.php b/examples/plus/simple.php
@@ -1,6 +1,6 @@
 <?php
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiPlusService.php';
+require_once '../../src/Contrib/apiPlusService.php';
 session_start();
 
 $client = new apiClient();

diff --git a/examples/prediction/serviceAccount.php b/examples/prediction/serviceAccount.php
@@ -16,7 +16,7 @@
  */
 
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiPredictionService.php';
+require_once '../../src/Contrib/apiPredictionService.php';
 
 // Set your client id, service account name, and the path to your private key.
 // For more information about obtaining these keys, visit:

diff --git a/examples/shopping/simple.php b/examples/shopping/simple.php
@@ -1,6 +1,6 @@
 <?php
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiShoppingService.php';
+require_once '../../src/Contrib/apiShoppingService.php';
 
 $client = new apiClient();
 $client->setApplicationName("Google Shopping PHP Starter Application");

diff --git a/examples/siteVerification/simple.php b/examples/siteVerification/simple.php
@@ -1,6 +1,6 @@
 <?php
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiSiteVerificationService.php';
+require_once '../../src/Contrib/apiSiteVerificationService.php';
 session_start();
 
 $client = new apiClient();

diff --git a/examples/tasks/index.php b/examples/tasks/index.php
@@ -16,7 +16,7 @@
  */
 session_start();
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiTasksService.php';
+require_once '../../src/Contrib/apiTasksService.php';
 
 $client = new apiClient();
 // Visit https://code.google.com/apis/console to generate your

diff --git a/examples/translate/simple.php b/examples/translate/simple.php
@@ -1,6 +1,6 @@
 <?php
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiTranslateService.php';
+require_once '../../src/Contrib/apiTranslateService.php';
 
 $client = new apiClient();
 $client->setApplicationName('Google Translate PHP Starter Application');

diff --git a/examples/urlshortener/index.php b/examples/urlshortener/index.php
@@ -17,7 +17,7 @@
 session_start();
 
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiUrlshortenerService.php';
+require_once '../../src/Contrib/apiUrlshortenerService.php';
 
 // Visit https://code.google.com/apis/console to
 // generate your client id, client secret, and redirect uri.

diff --git a/examples/userinfo/index.php b/examples/userinfo/index.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiOauth2Service.php';
+require_once '../../src/Contrib/apiOauth2Service.php';
 session_start();
 
 $client = new apiClient();

diff --git a/examples/webfonts/simple.php b/examples/webfonts/simple.php
@@ -1,6 +1,6 @@
 <?php
 require_once '../../src/apiClient.php';
-require_once '../../src/contrib/apiWebfontsService.php';
+require_once '../../src/Contrib/apiWebfontsService.php';
 
 $client = new apiClient();
 $client->setApplicationName("Google WebFonts PHP Starter Application");

diff --git a/src/GoogleApi/Auth/Auth.php b/src/GoogleApi/Auth/Auth.php
@@ -23,7 +23,7 @@
  * @author Chris Chabot <chabotc@google.com>
  *
  */
-abstract class apiAuth {
+abstract class Auth {
   abstract public function authenticate($service);
   abstract public function sign(HttpRequest $request);
   abstract public function createAuthUrl($scope);

diff --git a/src/GoogleApi/Auth/OAuth2.php b/src/GoogleApi/Auth/OAuth2.php
@@ -19,6 +19,7 @@
 use GoogleApi\Client;
 use GoogleApi\Io\HttpRequest;
 use GoogleApi\Service\Utils;
+use GoogleApi\Auth\Auth;
 
 /**
  * Authentication class that deals with the OAuth 2 web-server authentication flow