You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/10/07 17:54:40 UTC
svn commit: r1005506 [45/45] - in /shindig/branches/2.0.x: ./
content/editor/ content/editor/CodeMirror-0.8/
content/editor/CodeMirror-0.8/css/ content/editor/CodeMirror-0.8/js/
content/samplecontainer/examples/media/ etc/ etc/checkstyle/ extras/src/ma...
Modified: shindig/branches/2.0.x/php/src/social/converters/InputPeopleConverter.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/converters/InputPeopleConverter.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/converters/InputPeopleConverter.php (original)
+++ shindig/branches/2.0.x/php/src/social/converters/InputPeopleConverter.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
@@ -31,4 +31,4 @@ class InputPeopleConverter extends Input
public function convertXml($requestParam) {
throw new SocialSpiException("Operation not supported", ResponseError::$NOT_IMPLEMENTED);
}
-}
\ No newline at end of file
+}
Modified: shindig/branches/2.0.x/php/src/social/converters/OutputAtomConverter.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/converters/OutputAtomConverter.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/converters/OutputAtomConverter.php (original)
+++ shindig/branches/2.0.x/php/src/social/converters/OutputAtomConverter.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/converters/OutputBasicXmlConverter.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/converters/OutputBasicXmlConverter.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/converters/OutputBasicXmlConverter.php (original)
+++ shindig/branches/2.0.x/php/src/social/converters/OutputBasicXmlConverter.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/converters/OutputConverter.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/converters/OutputConverter.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/converters/OutputConverter.php (original)
+++ shindig/branches/2.0.x/php/src/social/converters/OutputConverter.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/converters/OutputJsonConverter.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/converters/OutputJsonConverter.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/converters/OutputJsonConverter.php (original)
+++ shindig/branches/2.0.x/php/src/social/converters/OutputJsonConverter.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/converters/OutputXmlConverter.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/converters/OutputXmlConverter.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/converters/OutputXmlConverter.php (original)
+++ shindig/branches/2.0.x/php/src/social/converters/OutputXmlConverter.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Account.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Account.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Account.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Account.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Activity.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Activity.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Activity.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Activity.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Address.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Address.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Address.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Address.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Album.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Album.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Album.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Album.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/ApiCollection.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/ApiCollection.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/ApiCollection.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/ApiCollection.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/BodyType.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/BodyType.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/BodyType.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/BodyType.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/ComplexField.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/ComplexField.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/ComplexField.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/ComplexField.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Email.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Email.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Email.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Email.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Enum.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Enum.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Enum.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Enum.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/IdSpec.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/IdSpec.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/IdSpec.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/IdSpec.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Im.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Im.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Im.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Im.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/ListField.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/ListField.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/ListField.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/ListField.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/MediaItem.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/MediaItem.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/MediaItem.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/MediaItem.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Message.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Message.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Message.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Message.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/MessageCollection.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/MessageCollection.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/MessageCollection.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/MessageCollection.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Name.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Name.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Name.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Name.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Organization.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Organization.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Organization.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Organization.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Person.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Person.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Person.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Person.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Phone.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Phone.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Phone.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Phone.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Photo.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Photo.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Photo.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Photo.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/model/Url.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/model/Url.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/model/Url.php (original)
+++ shindig/branches/2.0.x/php/src/social/model/Url.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/oauth/OAuthSecurityToken.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/oauth/OAuthSecurityToken.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/oauth/OAuthSecurityToken.php (original)
+++ shindig/branches/2.0.x/php/src/social/oauth/OAuthSecurityToken.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/sample/DefaultInvalidateService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/sample/DefaultInvalidateService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/sample/DefaultInvalidateService.php (original)
+++ shindig/branches/2.0.x/php/src/social/sample/DefaultInvalidateService.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/sample/JsonDbOpensocialService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/sample/JsonDbOpensocialService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/sample/JsonDbOpensocialService.php (original)
+++ shindig/branches/2.0.x/php/src/social/sample/JsonDbOpensocialService.php Thu Oct 7 15:54:09 2010
@@ -1,6 +1,6 @@
<?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
@@ -84,11 +84,13 @@ class JsonDbOpensocialService implements
private $allMessageCollections = null;
- private $jsonDbFileName = 'ShindigDb.json';
+ protected function getDbFilename() {
+ return sys_get_temp_dir() . '/' . 'ShindigDb' . getenv('BUILD_TAG') . '.json';
+ }
public function getDb() {
try {
- $fileName = sys_get_temp_dir() . '/' . $this->jsonDbFileName;
+ $fileName = $this->getDbFilename();
if (file_exists($fileName)) {
if (! is_readable($fileName)) {
throw new SocialSpiException("Could not read temp json db file: $fileName, check permissions", ResponseError::$INTERNAL_ERROR);
@@ -119,13 +121,13 @@ class JsonDbOpensocialService implements
}
private function saveDb($db) {
- if (! @file_put_contents(sys_get_temp_dir() . '/' . $this->jsonDbFileName, json_encode($db))) {
- throw new Exception("Could not save json db: " . sys_get_temp_dir() . '/' . $this->jsonDbFileName);
+ if (! @file_put_contents($this->getDbFilename(), json_encode($db))) {
+ throw new Exception("Could not save json db: " . $this->getDbFileName());
}
}
public function resetDb() {
- @unlink(sys_get_temp_dir() . '/' . $this->jsonDbFileName);
+ @unlink($this->getDbFilename());
}
private function getAllPeople() {
Modified: shindig/branches/2.0.x/php/src/social/service/ActivityHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/ActivityHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/ActivityHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/ActivityHandler.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/AlbumHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/AlbumHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/AlbumHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/AlbumHandler.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/AppDataHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/AppDataHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/AppDataHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/AppDataHandler.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/DataRequestHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/DataRequestHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/DataRequestHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/DataRequestHandler.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/GroupHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/GroupHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/GroupHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/GroupHandler.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/HandlerPreconditions.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/HandlerPreconditions.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/HandlerPreconditions.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/HandlerPreconditions.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/HttpHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/HttpHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/HttpHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/HttpHandler.php Thu Oct 7 15:54:09 2010
@@ -1,6 +1,6 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/InvalidateHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/InvalidateHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/InvalidateHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/InvalidateHandler.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/MediaItemHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/MediaItemHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/MediaItemHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/MediaItemHandler.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/MessagesHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/MessagesHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/MessagesHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/MessagesHandler.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/PersonHandler.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/PersonHandler.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/PersonHandler.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/PersonHandler.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/RequestItem.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/RequestItem.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/RequestItem.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/RequestItem.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/ResponseError.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/ResponseError.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/ResponseError.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/ResponseError.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/ResponseItem.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/ResponseItem.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/ResponseItem.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/ResponseItem.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/RestRequestItem.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/RestRequestItem.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/RestRequestItem.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/RestRequestItem.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/RpcRequestItem.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/RpcRequestItem.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/RpcRequestItem.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/RpcRequestItem.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/service/SocialSpiException.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/service/SocialSpiException.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/service/SocialSpiException.php (original)
+++ shindig/branches/2.0.x/php/src/social/service/SocialSpiException.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/servlet/ApiServlet.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/servlet/ApiServlet.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/servlet/ApiServlet.php (original)
+++ shindig/branches/2.0.x/php/src/social/servlet/ApiServlet.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/servlet/CompatibilityJsonRpcServlet.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/servlet/CompatibilityJsonRpcServlet.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/servlet/CompatibilityJsonRpcServlet.php (original)
+++ shindig/branches/2.0.x/php/src/social/servlet/CompatibilityJsonRpcServlet.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
@@ -23,4 +23,4 @@
*/
class CompatibilityJsonRpcServlet extends JsonRpcServlet {
protected $resultKey = 'data';
-}
\ No newline at end of file
+}
Modified: shindig/branches/2.0.x/php/src/social/servlet/DataServiceServlet.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/servlet/DataServiceServlet.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/servlet/DataServiceServlet.php (original)
+++ shindig/branches/2.0.x/php/src/social/servlet/DataServiceServlet.php Thu Oct 7 15:54:09 2010
@@ -1,6 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/servlet/JsonRpcServlet.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/servlet/JsonRpcServlet.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/servlet/JsonRpcServlet.php (original)
+++ shindig/branches/2.0.x/php/src/social/servlet/JsonRpcServlet.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/ActivityService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/ActivityService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/ActivityService.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/ActivityService.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/AlbumService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/AlbumService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/AlbumService.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/AlbumService.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
@@ -70,4 +70,4 @@ interface AlbumService {
*/
public function deleteAlbum($userId, $groupId, $albumId, $token);
-}
\ No newline at end of file
+}
Modified: shindig/branches/2.0.x/php/src/social/spi/AppDataService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/AppDataService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/AppDataService.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/AppDataService.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/CollectionOptions.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/CollectionOptions.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/CollectionOptions.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/CollectionOptions.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/DataCollection.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/DataCollection.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/DataCollection.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/DataCollection.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/GroupId.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/GroupId.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/GroupId.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/GroupId.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
@@ -48,4 +48,4 @@ class GroupId {
public function getType() {
return $this->type;
}
-}
\ No newline at end of file
+}
Modified: shindig/branches/2.0.x/php/src/social/spi/GroupService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/GroupService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/GroupService.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/GroupService.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/InvalidateService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/InvalidateService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/InvalidateService.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/InvalidateService.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/MediaItemService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/MediaItemService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/MediaItemService.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/MediaItemService.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/MessagesService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/MessagesService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/MessagesService.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/MessagesService.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/PersonService.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/PersonService.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/PersonService.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/PersonService.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/RestfulCollection.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/RestfulCollection.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/RestfulCollection.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/RestfulCollection.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
Modified: shindig/branches/2.0.x/php/src/social/spi/UserId.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/social/spi/UserId.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/social/spi/UserId.php (original)
+++ shindig/branches/2.0.x/php/src/social/spi/UserId.php Thu Oct 7 15:54:09 2010
@@ -1,5 +1,5 @@
<?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
@@ -56,4 +56,4 @@ class UserId {
public function getType() {
return $this->type;
}
-}
\ No newline at end of file
+}
Modified: shindig/branches/2.0.x/php/test/ShindigAllTests.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/test/ShindigAllTests.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/test/ShindigAllTests.php (original)
+++ shindig/branches/2.0.x/php/test/ShindigAllTests.php Thu Oct 7 15:54:09 2010
@@ -53,7 +53,7 @@ require_once 'test/TestContext.php';
if (defined('PHPUnit_MAIN_METHOD') === false) {
define('PHPUnit_MAIN_METHOD', 'ShindigAllTests::main');
}
-
+$_SERVER["HTTP_HOST"] = 'localhost';
class ShindigAllTests {
public static function main() {
Modified: shindig/branches/2.0.x/php/test/common/CacheFileTest.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/test/common/CacheFileTest.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/test/common/CacheFileTest.php (original)
+++ shindig/branches/2.0.x/php/test/common/CacheFileTest.php Thu Oct 7 15:54:09 2010
@@ -76,7 +76,7 @@ class CacheFileTest extends PHPUnit_Fram
* Tests cache->delete()
*/
public function testDelete() {
- @rmdir("/tmp/shindig/TestCache/te");
+ @rmdir(sys_get_temp_dir() . "/shindig/TestCache/te");
$this->cache->set("test", "testing");
$this->assertTrue(false != $this->cache->get("test"));
$this->cache->delete("test");
@@ -134,24 +134,24 @@ class CacheFileTest extends PHPUnit_Fram
* Tests cache->set()
*/
public function testSetException() {
- @rmdir("/tmp/shindig/TestCache/te");
- $this->assertTrue(touch("/tmp/shindig/TestCache/te"));
+ @rmdir(sys_get_temp_dir() . "/shindig/TestCache/te");
+ $this->assertTrue(touch(sys_get_temp_dir() . "/shindig/TestCache/te"));
$this->setExpectedException("CacheException");
try {
$this->cache->set("test", "testing");
} catch (Exception $e) {
- $this->assertTrue(unlink("/tmp/shindig/TestCache/te"));
+ $this->assertTrue(unlink(sys_get_temp_dir() . "/shindig/TestCache/te"));
throw $e;
}
- unlink("/tmp/shindig/TestCache/te");
+ unlink(sys_get_temp_dir() . "/shindig/TestCache/te");
}
/**
* Tests cache->invalidate()
*/
public function testInvalidation() {
- @unlink("/tmp/shindig/TestCache/te/test");
- @rmdir("/tmp/shindig/TestCache/te");
+ @unlink(sys_get_temp_dir() . "/shindig/TestCache/te/test");
+ @rmdir(sys_get_temp_dir() . "/shindig/TestCache/te");
$this->cache->set("test", "testing");
$this->cache->invalidate("test");
$this->assertEquals(false, $this->cache->get("test"));
@@ -163,4 +163,4 @@ class CacheFileTest extends PHPUnit_Fram
$this->assertEquals($expected, $output);
$this->cache->delete("test");
}
-}
\ No newline at end of file
+}
Added: shindig/branches/2.0.x/php/test/config/phpunit_to_surefire.xslt
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/test/config/phpunit_to_surefire.xslt?rev=1005506&view=auto
==============================================================================
--- shindig/branches/2.0.x/php/test/config/phpunit_to_surefire.xslt (added)
+++ shindig/branches/2.0.x/php/test/config/phpunit_to_surefire.xslt Thu Oct 7 15:54:09 2010
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+ -->
+
+<xsl:stylesheet version="2.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:fn="http://www.w3.org/2005/xpath-functions">
+ <xsl:output method="xml" version="1.0" encoding="UTF-8"
+ indent="yes" />
+ <xsl:param name="outputDir">.</xsl:param>
+
+ <xsl:template match="testsuites">
+ <xsl:apply-templates select="testsuite" />
+ </xsl:template>
+
+ <xsl:template match="testsuite">
+ <xsl:if test="testcase">
+ <xsl:variable name="outputName" select="./@name" />
+ <xsl:result-document href="{$outputDir}/TEST-{$outputName}.xml" method="xml">
+ <xsl:copy-of select="." />
+ </xsl:result-document>
+ </xsl:if>
+
+ <xsl:apply-templates select="testsuite" />
+ </xsl:template>
+</xsl:stylesheet>
Modified: shindig/branches/2.0.x/php/test/gadgets/FilesServletTest.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/test/gadgets/FilesServletTest.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/test/gadgets/FilesServletTest.php (original)
+++ shindig/branches/2.0.x/php/test/gadgets/FilesServletTest.php Thu Oct 7 15:54:09 2010
@@ -38,6 +38,10 @@ class MockContentFilesServlet extends Co
class FilesServletTest extends PHPUnit_Framework_TestCase
{
+ public function tearDown() {
+ ob_end_clean();
+ }
+
public function testResources() {
$servlet = new MockResourcesFilesServlet();
$servlet->uri = 'com/google/caja/plugin/domita-minified.js';
Modified: shindig/branches/2.0.x/php/test/gadgets/GadgetHtmlRendererTest.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/test/gadgets/GadgetHtmlRendererTest.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/test/gadgets/GadgetHtmlRendererTest.php (original)
+++ shindig/branches/2.0.x/php/test/gadgets/GadgetHtmlRendererTest.php Thu Oct 7 15:54:09 2010
@@ -150,12 +150,12 @@ class GadgetHtmlRendererTest extends PHP
$this->fail('two entries with script type inline');
}
//this is from dynamic height and should not be included
- $this->assertFalse(strpos($script['content'], 'gadgets.window=gadgets.window||{};'));
+ $this->assertFalse(strpos($script['content'], 'gadgets.window = gadgets.window || {};'));
//minimessage should be included
- $miniMessagePos = strpos($script['content'], 'gadgets.MiniMessage=function');
+ $miniMessagePos = strpos($script['content'], 'gadgets.MiniMessage = function');
$this->assertTrue($miniMessagePos > 0);
//we force flash to be appended, so it should be after minimessage
- $this->assertTrue(strpos($script['content'], 'gadgets.flash=gadgets.flash||{};') > $miniMessagePos);
+ $this->assertTrue(strpos($script['content'], 'gadgets.flash = gadgets.flash || {};') > $miniMessagePos);
$hasInline = true;
break;
default:
Modified: shindig/branches/2.0.x/php/test/misc/invalidation/count.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/test/misc/invalidation/count.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/test/misc/invalidation/count.php (original)
+++ shindig/branches/2.0.x/php/test/misc/invalidation/count.php Thu Oct 7 15:54:09 2010
@@ -19,7 +19,7 @@
*/
@date_default_timezone_set(@date_default_timezone_get());
-$filename = '/tmp/shindig_test_misc_invalidation_count';
+$filename = sys_get_temp_dir() . '/shindig_test_misc_invalidation_count';
if (file_exists($filename)) {
$count = file_get_contents($filename);
@@ -31,4 +31,4 @@ if (file_exists($filename)) {
$count += 1;
echo "Count: $count at time: " . date('Y-m-d H:i:s');
-file_put_contents($filename, $count);
\ No newline at end of file
+file_put_contents($filename, $count);
Modified: shindig/branches/2.0.x/php/test/social/InputMessagesConverterTest.php
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/test/social/InputMessagesConverterTest.php?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/test/social/InputMessagesConverterTest.php (original)
+++ shindig/branches/2.0.x/php/test/social/InputMessagesConverterTest.php Thu Oct 7 15:54:09 2010
@@ -70,7 +70,7 @@ class InputMessagesConverterTest extends
"body" : "Click here to review your invitation"
}';
$message = $this->inputConverter->convertJson($json);
- file_put_contents('/tmp/message.txt', print_r($json, true));
+ file_put_contents(sys_get_temp_dir() . '/message.txt', print_r($json, true));
$this->assertEquals('msgid', $message['id']);
$this->assertEquals('You have an invitation from Joe', $message['title']);
$this->assertEquals('Click here to review your invitation', $message['body']);
Modified: shindig/branches/2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/pom.xml?rev=1005506&r1=1005505&r2=1005506&view=diff
==============================================================================
--- shindig/branches/2.0.x/pom.xml (original)
+++ shindig/branches/2.0.x/pom.xml Thu Oct 7 15:54:09 2010
@@ -148,7 +148,7 @@
</developer>
<developer>
<id>bhofmann</id>
- <name>Bastian Hoffman</name>
+ <name>Bastian Hofmann</name>
<email>bhofmann@apache.org</email>
<organization>ASF</organization>
<roles>
@@ -363,6 +363,15 @@
<role>PMC Member</role>
</roles>
</developer>
+ <developer>
+ <id>hnguy</id>
+ <name>Han Nguyen</name>
+ <email>hnguy@apache.org</email>
+ <organization>ASF</organization>
+ <roles>
+ <role>PMC Member</role>
+ </roles>
+ </developer>
<!-- Mentors -->
<developer>
@@ -592,7 +601,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.6</version>
<configuration>
<configLocation>http://svn.apache.org/repos/asf/shindig/trunk/etc/checkstyle/checkstyle.xml</configLocation>
<headerLocation>http://svn.apache.org/repos/asf/shindig/trunk/etc/checkstyle/java.header</headerLocation>
@@ -731,6 +740,8 @@
<exclude>**/create.sql</exclude>
<exclude>**/drop.sql</exclude>
<exclude>**/derby.log</exclude>
+ <exclude>content/editor/CodeMirror-0.8/js/*</exclude>
+ <exclude>content/editor/CodeMirror-0.8/css/*</exclude>
</excludes>
</configuration>
</plugin>
@@ -834,6 +845,7 @@
<module>java/server</module>
<module>java/samples</module>
<module>extras</module>
+ <module>php</module>
<module>assembly</module>
</modules>
<build>
@@ -879,7 +891,13 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>php</id>
+ <modules>
+ <module>features</module>
+ <module>php</module>
+ </modules>
+ </profile>
<profile>
<id>assemble</id>
<build>
@@ -964,8 +982,13 @@
<!-- Maven -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -1195,6 +1218,8 @@
<exclude>**/create.sql</exclude>
<exclude>**/drop.sql</exclude>
<exclude>**/derby.log</exclude>
+ <exclude>content/editor/CodeMirror-0.8/js/*</exclude>
+ <exclude>content/editor/CodeMirror-0.8/css/*</exclude>
</excludes>
</configuration>
</plugin>
@@ -1454,12 +1479,26 @@
<artifactId>htmlparser</artifactId>
<version>r4209</version>
<scope>compile</scope>
+ <exclusions>
+ <!-- force use of xml-apis until caja fixes their pom -->
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
- <groupId>caja</groupId>
- <artifactId>caja</artifactId>
- <version>r4251</version>
- <scope>compile</scope>
+ <dependency>
+ <groupId>caja</groupId>
+ <artifactId>caja</artifactId>
+ <version>r4251</version>
+ <scope>compile</scope>
+ <exclusions>
+ <!-- force use of xml-apis until caja fixes their pom -->
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
@@ -1578,11 +1617,6 @@
<version>2.9.1</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.sanselan</groupId>
<artifactId>sanselan</artifactId>
<version>0.97-incubator</version>