You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ch...@apache.org on 2008/09/13 12:17:19 UTC
svn commit: r694914 - in /incubator/shindig/trunk/php: index.php src/social-api/ src/social/ src/social/http/RestServlet.php test/ShindigAllTests.php test/index.php test/social-api/ test/social/

Author: chabotc
Date: Sat Sep 13 03:17:17 2008
New Revision: 694914

URL: http://svn.apache.org/viewvc?rev=694914&view=rev
Log:
Code layout restructuring step1 : mv social-api social

Added:
    incubator/shindig/trunk/php/src/social/
      - copied from r694829, incubator/shindig/trunk/php/src/social-api/
    incubator/shindig/trunk/php/test/social/
      - copied from r694829, incubator/shindig/trunk/php/test/social-api/
Removed:
    incubator/shindig/trunk/php/src/social-api/
    incubator/shindig/trunk/php/test/social-api/
Modified:
    incubator/shindig/trunk/php/index.php
    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/index.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/index.php?rev=694914&r1=694913&r2=694914&view=diff
==============================================================================
--- incubator/shindig/trunk/php/index.php (original)
+++ incubator/shindig/trunk/php/index.php Sat Sep 13 03:17:17 2008
@@ -46,12 +46,12 @@
 					'src/gadgets/http',
 					'src/gadgets/oauth',
 					'src/gadgets/samplecontainer',
-					'src/social-api',
-					'src/social-api/http',
-					'src/social-api/dataservice',
-					'src/social-api/opensocial',
-					'src/social-api/opensocial/model',
-					'src/social-api/samplecontainer'
+					'src/social',
+					'src/social/http',
+					'src/social/dataservice',
+					'src/social/opensocial',
+					'src/social/opensocial/model',
+					'src/social/samplecontainer'
 				);
 	$extension_class_paths = Config::get('extension_class_paths');
 	if (!empty($extension_class_paths)) {

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=694914&r1=694829&r2=694914&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:17:17 2008
@@ -21,41 +21,41 @@
 require 'src/common/SecurityTokenDecoder.php';
 require 'src/common/SecurityToken.php';
 require 'src/common/BlobCrypter.php';
-require 'src/social-api/opensocial/model/Activity.php';
-require 'src/social-api/opensocial/model/Address.php';
-require 'src/social-api/opensocial/model/ApiCollection.php';
-require 'src/social-api/opensocial/model/BodyType.php';
-require 'src/social-api/opensocial/model/Email.php';
-require 'src/social-api/opensocial/model/Enum.php';
-require 'src/social-api/opensocial/model/IdSpec.php';
-require 'src/social-api/opensocial/model/MediaItem.php';
-require 'src/social-api/opensocial/model/Message.php';
-require 'src/social-api/opensocial/model/Name.php';
-require 'src/social-api/opensocial/model/Organization.php';
-require 'src/social-api/opensocial/model/Person.php';
-require 'src/social-api/opensocial/model/Phone.php';
-require 'src/social-api/opensocial/model/Url.php';
-require 'src/social-api/dataservice/GroupId.php';
-require 'src/social-api/dataservice/UserId.php';
-require 'src/social-api/dataservice/RestRequestItem.php';
-require 'src/social-api/dataservice/RestfulCollection.php';
-require 'src/social-api/dataservice/DataRequestHandler.php';
-require 'src/social-api/dataservice/ActivitiesHandler.php';
-require 'src/social-api/dataservice/AppDataHandler.php';
-require 'src/social-api/dataservice/PeopleHandler.php';
-require 'src/social-api/dataservice/ActivitiesService.php';
-require 'src/social-api/dataservice/AppDataService.php';
-require 'src/social-api/dataservice/PeopleService.php';
-require 'src/social-api/dataservice/ResponseItem.php';
-require 'src/social-api/converters/OutputConverter.php';
-require 'src/social-api/converters/OutputAtomConverter.php';
-require 'src/social-api/converters/OutputJsonConverter.php';
-require 'src/social-api/converters/OutputXmlConverter.php';
-require 'src/social-api/converters/InputConverter.php';
-require 'src/social-api/converters/InputAtomConverter.php';
-require 'src/social-api/converters/InputJsonConverter.php';
-require 'src/social-api/converters/InputXmlConverter.php';
-require 'src/social-api/canonical/JsonDbOpensocialService.php';
+require 'src/social/opensocial/model/Activity.php';
+require 'src/social/opensocial/model/Address.php';
+require 'src/social/opensocial/model/ApiCollection.php';
+require 'src/social/opensocial/model/BodyType.php';
+require 'src/social/opensocial/model/Email.php';
+require 'src/social/opensocial/model/Enum.php';
+require 'src/social/opensocial/model/IdSpec.php';
+require 'src/social/opensocial/model/MediaItem.php';
+require 'src/social/opensocial/model/Message.php';
+require 'src/social/opensocial/model/Name.php';
+require 'src/social/opensocial/model/Organization.php';
+require 'src/social/opensocial/model/Person.php';
+require 'src/social/opensocial/model/Phone.php';
+require 'src/social/opensocial/model/Url.php';
+require 'src/social/dataservice/GroupId.php';
+require 'src/social/dataservice/UserId.php';
+require 'src/social/dataservice/RestRequestItem.php';
+require 'src/social/dataservice/RestfulCollection.php';
+require 'src/social/dataservice/DataRequestHandler.php';
+require 'src/social/dataservice/ActivitiesHandler.php';
+require 'src/social/dataservice/AppDataHandler.php';
+require 'src/social/dataservice/PeopleHandler.php';
+require 'src/social/dataservice/ActivitiesService.php';
+require 'src/social/dataservice/AppDataService.php';
+require 'src/social/dataservice/PeopleService.php';
+require 'src/social/dataservice/ResponseItem.php';
+require 'src/social/converters/OutputConverter.php';
+require 'src/social/converters/OutputAtomConverter.php';
+require 'src/social/converters/OutputJsonConverter.php';
+require 'src/social/converters/OutputXmlConverter.php';
+require 'src/social/converters/InputConverter.php';
+require 'src/social/converters/InputAtomConverter.php';
+require 'src/social/converters/InputJsonConverter.php';
+require 'src/social/converters/InputXmlConverter.php';
+require 'src/social/canonical/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=694914&r1=694913&r2=694914&view=diff
==============================================================================
--- incubator/shindig/trunk/php/test/ShindigAllTests.php (original)
+++ incubator/shindig/trunk/php/test/ShindigAllTests.php Sat Sep 13 03:17:17 2008
@@ -30,10 +30,10 @@
 	$basePath = realpath('./php');
 	$locations = array('src/common', 'src/common/samplecontainer', 'src/gadgets', 
 			'src/gadgets/http', 'src/gadgets/oauth', 'src/gadgets/samplecontainer', 
-			'src/social-api', 'src/social-api/http', 'src/social-api/canonical', 
-			'src/social-api/dataservice', 'src/social-api/converters', 
-			'src/social-api/opensocial', 'src/social-api/opensocial/model', 
-			'src/social-api/samplecontainer');
+			'src/social', 'src/social/http', 'src/social/canonical', 
+			'src/social/dataservice', 'src/social/converters', 
+			'src/social/opensocial', 'src/social/opensocial/model', 
+			'src/social/samplecontainer');
 	$extension_class_paths = Config::get('extension_class_paths');
 	if (! empty($extension_class_paths)) {
 		$locations = array_merge(explode(',', $extension_class_paths), $locations);
@@ -69,7 +69,7 @@
 		$suite = new PHPUnit_Framework_TestSuite();
 		$suite->setName('Shindig');
 		$path = realpath('./php/test/');
-		$testTypes = array('common', 'gadgets', 'social-api');
+		$testTypes = array('common', 'gadgets', 'social');
 		foreach ($testTypes as $type) {
 			foreach (glob("$path/{$type}/*Test.php") as $file) {
 				if (is_readable($file)) {

Modified: incubator/shindig/trunk/php/test/index.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/test/index.php?rev=694914&r1=694913&r2=694914&view=diff
==============================================================================
--- incubator/shindig/trunk/php/test/index.php (original)
+++ incubator/shindig/trunk/php/test/index.php Sat Sep 13 03:17:17 2008
@@ -30,10 +30,10 @@
 	$basePath = realpath('../');
 	$locations = array('src/common', 'src/common/samplecontainer', 'src/gadgets', 
 			'src/gadgets/http', 'src/gadgets/oauth', 'src/gadgets/samplecontainer', 
-			'src/social-api', 'src/social-api/canonical', 'src/social-api/http', 
-			'src/social-api/dataservice', 'src/social-api/converters', 
-			'src/social-api/opensocial', 'src/social-api/opensocial/model', 
-			'src/social-api/samplecontainer');
+			'src/social', 'src/social/canonical', 'src/social/http', 
+			'src/social/dataservice', 'src/social/converters', 
+			'src/social/opensocial', 'src/social/opensocial/model', 
+			'src/social/samplecontainer');
 	$extension_class_paths = Config::get('extension_class_paths');
 	if (! empty($extension_class_paths)) {
 		$locations = array_merge(explode(',', $extension_class_paths), $locations);
@@ -60,7 +60,7 @@
 		$suite = new PHPUnit_Framework_TestSuite();
 		$suite->setName('Shindig');
 		$path = dirname($_SERVER['SCRIPT_FILENAME']);
-		$testTypes = array('common', 'gadgets', 'social-api');
+		$testTypes = array('common', 'gadgets', 'social');
 		foreach ($testTypes as $type) {
 			foreach (glob("$path/{$type}/*Test.php") as $file) {
 				if (is_readable($file)) {