Author: doll
Date: Wed Aug 6 11:03:32 2008
New Revision: 683342
URL: http://svn.apache.org/viewvc?rev=683342&view=rev
Log:
The JsonDbOpenSocialService and Test are now in the social/sample/spi directory
instead of sample/service because they implement interfaces in opensocial/spi.
Added:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/
- copied from r683336,
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
- copied, changed from r683336,
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java
Removed:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java?rev=683342&r1=683341&r2=683342&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
Wed Aug 6 11:03:32 2008
@@ -20,7 +20,7 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.social.ResponseItem;
import org.apache.shindig.social.opensocial.model.Activity;
-import org.apache.shindig.social.sample.service.JsonDbOpensocialService;
+import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
import com.google.inject.ImplementedBy;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java?rev=683342&r1=683341&r2=683342&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
Wed Aug 6 11:03:32 2008
@@ -19,7 +19,7 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.sample.service.JsonDbOpensocialService;
+import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
import com.google.inject.ImplementedBy;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java?rev=683342&r1=683341&r2=683342&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
Wed Aug 6 11:03:32 2008
@@ -20,7 +20,7 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.social.ResponseItem;
import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.sample.service.JsonDbOpensocialService;
+import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
import com.google.inject.ImplementedBy;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java?rev=683342&r1=683341&r2=683342&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/container/SampleContainerHandler.java
Wed Aug 6 11:03:32 2008
@@ -23,7 +23,7 @@
import org.apache.shindig.social.ResponseItem;
import org.apache.shindig.social.opensocial.service.DataRequestHandler;
import org.apache.shindig.social.opensocial.service.RequestItem;
-import org.apache.shindig.social.sample.service.JsonDbOpensocialService;
+import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
import com.google.inject.Inject;
import org.apache.commons.httpclient.HttpClient;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=683342&r1=683336&r2=683342&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
Wed Aug 6 11:03:32 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.sample.service;
+package org.apache.shindig.social.sample.spi;
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.util.ImmediateFuture;
Copied:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
(from r683336,
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java)
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java?p2=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java&r1=683336&r2=683342&rev=683342&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/canonical/JsonDbOpensocialServiceTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
Wed Aug 6 11:03:32 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.shindig.social.canonical;
+package org.apache.shindig.social.sample.spi;
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.testing.FakeGadgetToken;
@@ -29,7 +29,6 @@
import org.apache.shindig.social.opensocial.spi.PersonService;
import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import org.apache.shindig.social.opensocial.spi.UserId;
-import org.apache.shindig.social.sample.service.JsonDbOpensocialService;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;