svn commit: r694921 - in /incubator/shindig/trunk/php: src/social/canonical/ src/social/http/ src/social/sample/ test/

[chabotc]

Author: chabotc
Date: Sat Sep 13 03:44:54 2008
New Revision: 694921

URL: http://svn.apache.org/viewvc?rev=694921&view=rev
Log:
Step 6: Remove old sample services, and move the jsondb one to the sample 
directory

Added:
    incubator/shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php
      - copied unchanged from r694919, 
incubator/shindig/trunk/php/src/social/canonical/JsonDbOpensocialService.php
Removed:
    incubator/shindig/trunk/php/src/social/canonical/
    incubator/shindig/trunk/php/src/social/sample/BasicActivitiesService.php
    incubator/shindig/trunk/php/src/social/sample/BasicAppDataService.php
    incubator/shindig/trunk/php/src/social/sample/BasicMessagesService.php
    incubator/shindig/trunk/php/src/social/sample/BasicPeopleService.php
    incubator/shindig/trunk/php/src/social/sample/XmlStateFileFetcher.php
Modified:
    incubator/shindig/trunk/php/src/social/http/RestServlet.php
    incubator/shindig/trunk/php/test/ShindigAllTests.php
    incubator/shindig/trunk/php/test/index.php

Modified: incubator/shindig/trunk/php/src/social/http/RestServlet.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/social/http/RestServlet.php?rev=694921&r1=694920&r2=694921&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/social/http/RestServlet.php (original)
+++ incubator/shindig/trunk/php/src/social/http/RestServlet.php Sat Sep 13 
03:44:54 2008
@@ -55,7 +55,7 @@
 require 'src/social/converters/InputAtomConverter.php';
 require 'src/social/converters/InputJsonConverter.php';
 require 'src/social/converters/InputXmlConverter.php';
-require 'src/social/canonical/JsonDbOpensocialService.php';
+require 'src/social/sample/JsonDbOpensocialService.php';
 
 class RestException extends Exception {}
 

Modified: incubator/shindig/trunk/php/test/ShindigAllTests.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/test/ShindigAllTests.php?rev=694921&r1=694920&r2=694921&view=diff
==============================================================================
--- incubator/shindig/trunk/php/test/ShindigAllTests.php (original)
+++ incubator/shindig/trunk/php/test/ShindigAllTests.php Sat Sep 13 03:44:54 
2008
@@ -28,12 +28,10 @@
 function __autoload($className)
 {
        $basePath = realpath('./php');
-       $locations = array('src/common', 'src/common/sample', 'src/gadgets', 
-                       'src/gadgets/http', 'src/gadgets/oauth', 
'src/gadgets/sample', 
-                       'src/social', 'src/social/http', 
'src/social/canonical', 
-                       'src/social/service', 'src/social/converters', 
-                       'src/social/opensocial', 'src/social/spi', 
'src/social/model', 
-                       'src/social/sample');
+       $locations = array('src/common', 'src/common/sample', 'src/gadgets', 
'src/gadgets/http', 
+                       'src/gadgets/oauth', 'src/gadgets/sample', 
'src/social', 'src/social/http', 
+                       'src/social/service', 'src/social/converters', 
'src/social/opensocial', 
+                       'src/social/spi', 'src/social/model', 
'src/social/sample');
        $extension_class_paths = Config::get('extension_class_paths');
        if (! empty($extension_class_paths)) {
                $locations = array_merge(explode(',', $extension_class_paths), 
$locations);

Modified: incubator/shindig/trunk/php/test/index.php
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/php/test/index.php?rev=694921&r1=694920&r2=694921&view=diff
==============================================================================
--- incubator/shindig/trunk/php/test/index.php (original)
+++ incubator/shindig/trunk/php/test/index.php Sat Sep 13 03:44:54 2008
@@ -28,12 +28,10 @@
 function __autoload($className)
 {
        $basePath = realpath('../');
-       $locations = array('src/common', 'src/common/sample', 'src/gadgets', 
-                       'src/gadgets/http', 'src/gadgets/oauth', 
'src/gadgets/sample', 
-                       'src/social', 'src/social/canonical', 
'src/social/http', 
-                       'src/social/service', 'src/social/converters', 
-                       'src/social/opensocial', 'src/social/spi', 
'src/social/model', 
-                       'src/social/sample');
+       $locations = array('src/common', 'src/common/sample', 'src/gadgets', 
'src/gadgets/http', 
+                       'src/gadgets/oauth', 'src/gadgets/sample', 
'src/social', 'src/social/http', 
+                       'src/social/service', 'src/social/converters', 
'src/social/opensocial', 
+                       'src/social/spi', 'src/social/model', 
'src/social/sample');
        $extension_class_paths = Config::get('extension_class_paths');
        if (! empty($extension_class_paths)) {
                $locations = array_merge(explode(',', $extension_class_paths), 
$locations);