Ok.

a first BIG questiong.

i have 3 big implementations (>70M users in total) with shindig PHP for OS
0.7, using json wire format (since i dont think REST is ready for production
yet) that should have prime time pretty soon.

how should I/we handle this stuff? just get stuck with /reTIRED branch?

ropu

On Thu, Jul 17, 2008 at 5:31 AM, <[EMAIL PROTECTED]> wrote:

> Author: chabotc
> Date: Thu Jul 17 01:31:44 2008
> New Revision: 677533
>
> URL: http://svn.apache.org/viewvc?rev=677533&view=rev
> Log:
> Deleted the old json wire format code for PHP, If you still need this code
> please use the svn branch at incubator/shindig/branches/reTIRED/
>
> Added:
>    incubator/shindig/trunk/php/src/socialrest/opensocial/model/
>      - copied from r677529,
> incubator/shindig/trunk/php/src/socialdata/opensocial/model/
> Removed:
>    incubator/shindig/trunk/php/src/socialdata/
> Modified:
>    incubator/shindig/trunk/php/index.php
>    incubator/shindig/trunk/php/src/socialrest/http/RestServlet.php
>
> Modified: incubator/shindig/trunk/php/index.php
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/trunk/php/index.php?rev=677533&r1=677532&r2=677533&view=diff
>
> ==============================================================================
> --- incubator/shindig/trunk/php/index.php (original)
> +++ incubator/shindig/trunk/php/index.php Thu Jul 17 01:31:44 2008
> @@ -46,22 +46,13 @@
>                                        'src/gadgets/http',
>                                        'src/gadgets/oauth',
>                                        'src/gadgets/samplecontainer',
> -                                       'src/socialdata/opensocial/model'
> +                                       'src/socialdata/opensocial/model',
> +                                       'src/socialrest',
> +                                       'src/socialrest/http',
> +                                       'src/socialrest/opensocial',
> +                                       'src/socialrest/opensocial/model',
> +                                       'src/socialrest/samplecontainer'
>                                );
> -       //FIXME the sample container implementations differ between the
> rest and json wire formats
> -       //      this way containers that use the original SPI don't break
> on update
> -       //      remove this hack once we completely switched over
> -       if (strpos($_SERVER["REQUEST_URI"], '/social/rest') !== false) {
> -               $locations[] = 'src/socialrest';
> -               $locations[] = 'src/socialrest/http';
> -               $locations[] = 'src/socialrest/opensocial';
> -               $locations[] = 'src/socialrest/samplecontainer';
> -       } elseif (strpos($_SERVER["REQUEST_URI"], '/social/data') !==
> false) {
> -               $locations[] = 'src/socialdata';
> -               $locations[] = 'src/socialdata/http';
> -               $locations[] = 'src/socialdata/opensocial';
> -               $locations[] = 'src/socialdata/samplecontainer';
> -       }
>        $extension_class_paths = Config::get('extension_class_paths');
>        if (!empty($extension_class_paths)) {
>                $locations = array_merge(explode(',',
> $extension_class_paths), $locations);
> @@ -83,7 +74,6 @@
>                Config::get('web_prefix') . '/gadgets/makeRequest' =>
> 'ProxyServlet',
>                Config::get('web_prefix') . '/gadgets/ifr' =>
> 'GadgetRenderingServlet',
>                Config::get('web_prefix') . '/gadgets/metadata' =>
> 'JsonRpcServlet',
> -               Config::get('web_prefix') . '/social/data' =>
> 'GadgetDataServlet',
>                Config::get('web_prefix') . '/social/rest' => 'RestServlet',
>                Config::get('web_prefix') . '/public.crt' => 'CertServlet'
>                );
>
> Modified: incubator/shindig/trunk/php/src/socialrest/http/RestServlet.php
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/socialrest/http/RestServlet.php?rev=677533&r1=677532&r2=677533&view=diff
>
> ==============================================================================
> --- incubator/shindig/trunk/php/src/socialrest/http/RestServlet.php
> (original)
> +++ incubator/shindig/trunk/php/src/socialrest/http/RestServlet.php Thu Jul
> 17 01:31:44 2008
> @@ -21,20 +21,20 @@
>  require 'src/common/SecurityTokenDecoder.php';
>  require 'src/common/SecurityToken.php';
>  require 'src/common/BlobCrypter.php';
> -require 'src/socialdata/opensocial/model/Activity.php';
> -require 'src/socialdata/opensocial/model/Address.php';
> -require 'src/socialdata/opensocial/model/ApiCollection.php';
> -require 'src/socialdata/opensocial/model/BodyType.php';
> -require 'src/socialdata/opensocial/model/Email.php';
> -require 'src/socialdata/opensocial/model/Enum.php';
> -require 'src/socialdata/opensocial/model/IdSpec.php';
> -require 'src/socialdata/opensocial/model/MediaItem.php';
> -require 'src/socialdata/opensocial/model/Message.php';
> -require 'src/socialdata/opensocial/model/Name.php';
> -require 'src/socialdata/opensocial/model/Organization.php';
> -require 'src/socialdata/opensocial/model/Person.php';
> -require 'src/socialdata/opensocial/model/Phone.php';
> -require 'src/socialdata/opensocial/model/Url.php';
> +require 'src/socialrest/opensocial/model/Activity.php';
> +require 'src/socialrest/opensocial/model/Address.php';
> +require 'src/socialrest/opensocial/model/ApiCollection.php';
> +require 'src/socialrest/opensocial/model/BodyType.php';
> +require 'src/socialrest/opensocial/model/Email.php';
> +require 'src/socialrest/opensocial/model/Enum.php';
> +require 'src/socialrest/opensocial/model/IdSpec.php';
> +require 'src/socialrest/opensocial/model/MediaItem.php';
> +require 'src/socialrest/opensocial/model/Message.php';
> +require 'src/socialrest/opensocial/model/Name.php';
> +require 'src/socialrest/opensocial/model/Organization.php';
> +require 'src/socialrest/opensocial/model/Person.php';
> +require 'src/socialrest/opensocial/model/Phone.php';
> +require 'src/socialrest/opensocial/model/Url.php';
>  require 'src/socialrest/GroupId.php';
>  require 'src/socialrest/UserId.php';
>  require 'src/socialrest/ResponseItem.php';
>
>
>


-- 
.-. --- .--. ..-
R o p u

Reply via email to