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/07/04 12:35:56 UTC
svn commit: r673995 - in /incubator/shindig/trunk/php/src: common/ gadgets/
gadgets/samplecontainer/ socialdata/http/ socialdata/opensocial/model/
socialdata/samplecontainer/ socialrest/ socialrest/http/
Author: chabotc
Date: Fri Jul 4 03:35:55 2008
New Revision: 673995
URL: http://svn.apache.org/viewvc?rev=673995&view=rev
Log:
Fixes __constructor/__construct typo in model/Email.php, Fixes missing handle bug in CacheMecache delete function, and adds license headers to files that were missing it
Modified:
incubator/shindig/trunk/php/src/common/CacheMemcache.php
incubator/shindig/trunk/php/src/gadgets/Auth.php
incubator/shindig/trunk/php/src/gadgets/GadgetException.php
incubator/shindig/trunk/php/src/gadgets/GadgetId.php
incubator/shindig/trunk/php/src/gadgets/GadgetServer.php
incubator/shindig/trunk/php/src/gadgets/JsonRpcGadgetContext.php
incubator/shindig/trunk/php/src/gadgets/JsonRpcHandler.php
incubator/shindig/trunk/php/src/gadgets/Preload.php
incubator/shindig/trunk/php/src/gadgets/ProxyGadgetContext.php
incubator/shindig/trunk/php/src/gadgets/samplecontainer/BasicBlobCrypter.php
incubator/shindig/trunk/php/src/socialdata/http/GadgetDataServlet.php
incubator/shindig/trunk/php/src/socialdata/opensocial/model/Email.php
incubator/shindig/trunk/php/src/socialdata/samplecontainer/StateFileDataHandler.php
incubator/shindig/trunk/php/src/socialrest/AppDataHandler.php
incubator/shindig/trunk/php/src/socialrest/http/RestServlet.php
Modified: incubator/shindig/trunk/php/src/common/CacheMemcache.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/common/CacheMemcache.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/common/CacheMemcache.php (original)
+++ incubator/shindig/trunk/php/src/common/CacheMemcache.php Fri Jul 4 03:35:55 2008
@@ -116,8 +116,7 @@
{
$this->check();
// we store it with the cache_time default expiration so objects will atleast get cleaned eventually.
- if (memcache_set($this->connection, $key, array('time' => time(),
- 'data' => $value), 0, Config::Get('cache_time')) === false) {
+ if (@memcache_set($this->connection, $key, array('time' => time(), 'data' => $value), false, Config::Get('cache_time')) == false) {
throw new CacheException("Couldn't store data in cache");
}
}
@@ -125,6 +124,6 @@
public function delete($key)
{
$this->check();
- @memcache_delete($key);
+ @memcache_delete($this->connection, $key);
}
}
Modified: incubator/shindig/trunk/php/src/gadgets/Auth.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/Auth.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/Auth.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/Auth.php Fri Jul 4 03:35:55 2008
@@ -1,5 +1,4 @@
<?php
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: incubator/shindig/trunk/php/src/gadgets/GadgetException.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/GadgetException.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/GadgetException.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/GadgetException.php Fri Jul 4 03:35:55 2008
@@ -1,4 +1,22 @@
<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
class GadgetException extends Exception {}
Modified: incubator/shindig/trunk/php/src/gadgets/GadgetId.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/GadgetId.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/GadgetId.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/GadgetId.php Fri Jul 4 03:35:55 2008
@@ -1,4 +1,22 @@
<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
class GadgetId {
private $uri;
Modified: incubator/shindig/trunk/php/src/gadgets/GadgetServer.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/GadgetServer.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/GadgetServer.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/GadgetServer.php Fri Jul 4 03:35:55 2008
@@ -1,5 +1,4 @@
<?php
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: incubator/shindig/trunk/php/src/gadgets/JsonRpcGadgetContext.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/JsonRpcGadgetContext.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/JsonRpcGadgetContext.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/JsonRpcGadgetContext.php Fri Jul 4 03:35:55 2008
@@ -1,4 +1,22 @@
<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
class JsonRpcGadgetContext extends GadgetContext {
Modified: incubator/shindig/trunk/php/src/gadgets/JsonRpcHandler.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/JsonRpcHandler.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/JsonRpcHandler.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/JsonRpcHandler.php Fri Jul 4 03:35:55 2008
@@ -1,4 +1,22 @@
<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
class JsonRpcHandler {
Modified: incubator/shindig/trunk/php/src/gadgets/Preload.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/Preload.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/Preload.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/Preload.php Fri Jul 4 03:35:55 2008
@@ -1,5 +1,4 @@
<?php
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: incubator/shindig/trunk/php/src/gadgets/ProxyGadgetContext.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/ProxyGadgetContext.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/ProxyGadgetContext.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/ProxyGadgetContext.php Fri Jul 4 03:35:55 2008
@@ -1,4 +1,22 @@
<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
class ProxyGadgetContext extends GadgetContext {
Modified: incubator/shindig/trunk/php/src/gadgets/samplecontainer/BasicBlobCrypter.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/gadgets/samplecontainer/BasicBlobCrypter.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/gadgets/samplecontainer/BasicBlobCrypter.php (original)
+++ incubator/shindig/trunk/php/src/gadgets/samplecontainer/BasicBlobCrypter.php Fri Jul 4 03:35:55 2008
@@ -1,4 +1,22 @@
<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
class BlobExpiredException extends Exception {}
Modified: incubator/shindig/trunk/php/src/socialdata/http/GadgetDataServlet.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/socialdata/http/GadgetDataServlet.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/socialdata/http/GadgetDataServlet.php (original)
+++ incubator/shindig/trunk/php/src/socialdata/http/GadgetDataServlet.php Fri Jul 4 03:35:55 2008
@@ -16,6 +16,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
+
require 'src/common/HttpServlet.php';
require 'src/socialdata/DataResponse.php';
require 'src/socialdata/GadgetDataHandler.php';
Modified: incubator/shindig/trunk/php/src/socialdata/opensocial/model/Email.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/socialdata/opensocial/model/Email.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/socialdata/opensocial/model/Email.php (original)
+++ incubator/shindig/trunk/php/src/socialdata/opensocial/model/Email.php Fri Jul 4 03:35:55 2008
@@ -26,7 +26,7 @@
public $address;
public $type;
- public function __constructor($address, $type)
+ public function __construct($address, $type)
{
$this->address = $address;
$this->type = $type;
Modified: incubator/shindig/trunk/php/src/socialdata/samplecontainer/StateFileDataHandler.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/socialdata/samplecontainer/StateFileDataHandler.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/socialdata/samplecontainer/StateFileDataHandler.php (original)
+++ incubator/shindig/trunk/php/src/socialdata/samplecontainer/StateFileDataHandler.php Fri Jul 4 03:35:55 2008
@@ -1,4 +1,22 @@
<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
class StateFileDataHandler extends GadgetDataHandler {
private $handles = array('DUMP_STATE', 'SET_STATE', 'SET_EVILNESS');
Modified: incubator/shindig/trunk/php/src/socialrest/AppDataHandler.php
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/php/src/socialrest/AppDataHandler.php?rev=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/socialrest/AppDataHandler.php (original)
+++ incubator/shindig/trunk/php/src/socialrest/AppDataHandler.php Fri Jul 4 03:35:55 2008
@@ -1,5 +1,4 @@
<?php
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
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=673995&r1=673994&r2=673995&view=diff
==============================================================================
--- incubator/shindig/trunk/php/src/socialrest/http/RestServlet.php (original)
+++ incubator/shindig/trunk/php/src/socialrest/http/RestServlet.php Fri Jul 4 03:35:55 2008
@@ -16,6 +16,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
+
require 'src/common/HttpServlet.php';
require 'src/common/SecurityTokenDecoder.php';
require 'src/common/SecurityToken.php';