Author: awiner
Date: Tue Mar 17 16:24:20 2009
New Revision: 755306
URL: http://svn.apache.org/viewvc?rev=755306&view=rev
Log:
SHINDIG-979: Default social-api bindings should not include sample code
- Introduce SampleModule class
- Remove all sample bindings from SocialApiGuiceModule
- Update samples project accordingly. NOTE: the samples build is broken after
this checkin, but was broken before it in the same way.
Removed:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
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/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
Tue Mar 17 16:24:20 2009
@@ -25,9 +25,14 @@
import org.apache.shindig.social.core.util.BeanXStreamAtomConverter;
import org.apache.shindig.social.core.util.xstream.XStream081Configuration;
import org.apache.shindig.social.opensocial.jpa.spi.SpiEntityManagerFactory;
+import org.apache.shindig.social.opensocial.service.ActivityHandler;
+import org.apache.shindig.social.opensocial.service.AppDataHandler;
+import org.apache.shindig.social.opensocial.service.MessageHandler;
+import org.apache.shindig.social.opensocial.service.PersonHandler;
import javax.persistence.EntityManager;
+import com.google.common.collect.ImmutableSet;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -54,10 +59,15 @@
*
* @return the data service servlet
*/
- protected static DataServiceServlet getDataServiceServlet(Injector injector)
{
- // Set data service servlet again to use JPA guice dependencies
+ public static DataServiceServlet getDataServiceServlet(Injector injector) {
+ // Set data service servlet again to use JPA guice dependencies
DataServiceServlet servlet = new DataServiceServlet();
- servlet.setHandlerRegistry(injector.getInstance(HandlerRegistry.class));
+ HandlerRegistry registry = injector.getInstance(HandlerRegistry.class);
+ registry.addHandlers(
+ ImmutableSet.<Object>of(ActivityHandler.class, AppDataHandler.class,
+ PersonHandler.class, MessageHandler.class));
+
+ servlet.setHandlerRegistry(registry);
servlet.setBeanConverters(new BeanJsonConverter(injector),
new BeanXStreamConverter(new XStream081Configuration(injector)),
new BeanXStreamAtomConverter(new XStream081Configuration(injector)));
Modified:
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
Tue Mar 17 16:24:20 2009
@@ -20,6 +20,7 @@
import javax.persistence.EntityManager;
+import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.PropertiesModule;
import org.apache.shindig.gadgets.DefaultGuiceModule;
import org.apache.shindig.gadgets.oauth.OAuthModule;
@@ -49,6 +50,8 @@
import org.apache.shindig.social.opensocial.model.Organization;
import org.apache.shindig.social.opensocial.model.Person;
import org.apache.shindig.social.opensocial.model.Url;
+import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
+import org.apache.shindig.social.opensocial.oauth.OAuthEntry;
import org.apache.shindig.social.opensocial.spi.ActivityService;
import org.apache.shindig.social.opensocial.spi.AppDataService;
import org.apache.shindig.social.opensocial.spi.PersonService;
@@ -56,6 +59,8 @@
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;
+import net.oauth.OAuthConsumer;
+
/**
* Provides component injection for tests
* Injects Social API and JPA persistence guice modules
@@ -89,6 +94,8 @@
this.bind(AppDataService.class).to(AppDataServiceDb.class).in(Scopes.SINGLETON);
this.bind(PersonService.class).to(PersonServiceDb.class).in(Scopes.SINGLETON);
+ this.bind(OAuthDataStore.class).toInstance(new NullOAuthDataStore());
+
// Entities
this.bind(Activity.class).to(ActivityDb.class);
this.bind(Account.class).to(AccountDb.class);
@@ -102,4 +109,30 @@
this.bind(Person.class).to(PersonDb.class);
this.bind(Url.class).to(UrlDb.class);
}
+
+ private static class NullOAuthDataStore implements OAuthDataStore {
+ public OAuthEntry getEntry(String oauthToken) {
+ return null;
+ }
+
+ public OAuthConsumer getConsumer(String consumerKey) {
+ return null;
+ }
+
+ public OAuthEntry generateRequestToken(String consumerKey) {
+ throw new UnsupportedOperationException();
+ }
+
+ public OAuthEntry convertToAccessToken(OAuthEntry entry) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void authorizeToken(OAuthEntry entry, String userId) {
+ throw new UnsupportedOperationException();
+ }
+
+ public SecurityToken getSecurityTokenForConsumerRequest(String
consumerKey, String userId) {
+ throw new UnsupportedOperationException();
+ }
+ }
}
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
Tue Mar 17 16:24:20 2009
@@ -29,7 +29,7 @@
<param-value>
org.apache.shindig.common.PropertiesModule:
org.apache.shindig.gadgets.DefaultGuiceModule:
- org.apache.shindig.social.core.config.SocialApiGuiceModule:
+ org.apache.shindig.social.sample.SampleModule:
org.apache.shindig.gadgets.oauth.OAuthModule:
org.apache.shindig.common.cache.ehcache.EhCacheModule
</param-value>
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
Tue Mar 17 16:24:20 2009
@@ -26,7 +26,7 @@
<!-- If you have your own Guice module(s), put them here as a
colon-separated list. -->
<context-param>
<param-name>guice-modules</param-name>
-
<param-value>org.apache.shindig.common.PropertiesModule:org.apache.shindig.social.core.config.SocialApiGuiceModule</param-value>
+
<param-value>org.apache.shindig.common.PropertiesModule:org.apache.shindig.social.sample.SampleModule</param-value>
</context-param>
<filter>
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Tue Mar
17 16:24:20 2009
@@ -29,7 +29,7 @@
<param-value>
org.apache.shindig.common.PropertiesModule:
org.apache.shindig.gadgets.DefaultGuiceModule:
- org.apache.shindig.social.core.config.SocialApiGuiceModule:
+ org.apache.shindig.social.sample.SampleModule:
org.apache.shindig.gadgets.oauth.OAuthModule:
org.apache.shindig.common.cache.ehcache.EhCacheModule
</param-value>
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
(original)
+++
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/JettyLauncher.java
Tue Mar 17 16:24:20 2009
@@ -30,11 +30,7 @@
import org.apache.shindig.gadgets.servlet.RpcServlet;
import org.apache.shindig.protocol.DataServiceServlet;
import org.apache.shindig.protocol.JsonRpcServlet;
-import org.apache.shindig.server.endtoend.EndToEndModule;
-
-import com.google.common.base.Join;
-import com.google.common.collect.Maps;
-
+import org.apache.shindig.social.sample.SampleModule;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.DefaultServlet;
@@ -44,6 +40,9 @@
import java.io.IOException;
import java.util.Map;
+import com.google.common.base.Join;
+import com.google.common.collect.Maps;
+
/**
* Simple programmatic initialization of Shindig using Jetty and common paths.
*/
@@ -77,7 +76,7 @@
Map<String, String> initParams = Maps.newHashMap();
String modules = Join
- .join(":", EndToEndModule.class.getName(),
DefaultGuiceModule.class.getName(),
+ .join(":", SampleModule.class.getName(),
DefaultGuiceModule.class.getName(),
PropertiesModule.class.getName(), OAuthModule.class.getName());
initParams.put(GuiceServletContextListener.MODULES_ATTRIBUTE, modules);
Modified:
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
---
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
(original)
+++
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
Tue Mar 17 16:24:20 2009
@@ -27,10 +27,7 @@
import org.apache.shindig.gadgets.servlet.GadgetRenderingServlet;
import org.apache.shindig.protocol.DataServiceServlet;
import org.apache.shindig.protocol.JsonRpcServlet;
-
-import com.google.common.base.Join;
-import com.google.common.collect.Maps;
-
+import org.apache.shindig.social.sample.SampleModule;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.handler.ResourceHandler;
import org.mortbay.jetty.servlet.Context;
@@ -50,6 +47,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.google.common.base.Join;
+import com.google.common.collect.Maps;
+
/**
* Suite for running the end-to-end tests. The suite is responsible for
starting up and shutting
* down the server.
@@ -109,7 +109,7 @@
Map<String, String> initParams = Maps.newHashMap();
String modules = Join
- .join(":", EndToEndModule.class.getName(),
DefaultGuiceModule.class.getName(),
+ .join(":", SampleModule.class.getName(),
DefaultGuiceModule.class.getName(),
PropertiesModule.class.getName(), OAuthModule.class.getName());
initParams.put(GuiceServletContextListener.MODULES_ATTRIBUTE, modules);
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
Tue Mar 17 16:24:20 2009
@@ -22,8 +22,6 @@
import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.servlet.ParameterFetcher;
import org.apache.shindig.protocol.DataServiceServletFetcher;
-import org.apache.shindig.protocol.DefaultHandlerRegistry;
-import org.apache.shindig.protocol.HandlerRegistry;
import org.apache.shindig.protocol.conversion.BeanConverter;
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
import org.apache.shindig.protocol.conversion.BeanXStreamConverter;
@@ -33,18 +31,17 @@
import org.apache.shindig.social.core.util.xstream.XStream081Configuration;
import org.apache.shindig.social.opensocial.service.ActivityHandler;
import org.apache.shindig.social.opensocial.service.AppDataHandler;
-import org.apache.shindig.social.opensocial.service.PersonHandler;
import org.apache.shindig.social.opensocial.service.MessageHandler;
-import org.apache.shindig.social.sample.service.SampleContainerHandler;
+import org.apache.shindig.social.opensocial.service.PersonHandler;
+
+import java.util.List;
+import java.util.Set;
import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
import com.google.inject.TypeLiteral;
import com.google.inject.name.Names;
-import java.util.List;
-import java.util.Set;
-
/**
* Provides social api component injection. Implementor may want to replace
this module if they need
* to replace some of the internals of the Social API, like for instance the
JSON to Bean to JSON
@@ -56,14 +53,9 @@
/** {...@inheritdoc} */
@Override
protected void configure() {
- bind(HandlerRegistry.class).to(DefaultHandlerRegistry.class);
-
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet"))
.to(DataServiceServletFetcher.class);
- bind(String.class).annotatedWith(Names.named("shindig.canonical.json.db"))
- .toInstance("sampledata/canonicaldb.json");
-
bind(Boolean.class)
.annotatedWith(Names.named(AnonymousAuthenticationHandler.ALLOW_UNAUTHENTICATED))
.toInstance(Boolean.TRUE);
@@ -79,7 +71,15 @@
AuthenticationHandlerProvider.class);
bind(new
TypeLiteral<Set<Object>>(){}).annotatedWith(Names.named("org.apache.shindig.social.handlers"))
- .toInstance(ImmutableSet.<Object>of(ActivityHandler.class,
AppDataHandler.class,
- PersonHandler.class, MessageHandler.class,
SampleContainerHandler.class));
+ .toInstance(getHandlers());
+ }
+
+ /**
+ * Hook to provide a Set of request handlers. Subclasses may override
+ * to add or replace additional handlers.
+ */
+ protected Set<Object> getHandlers() {
+ return ImmutableSet.<Object>of(ActivityHandler.class, AppDataHandler.class,
+ PersonHandler.class, MessageHandler.class);
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
Tue Mar 17 16:24:20 2009
@@ -17,13 +17,9 @@
*/
package org.apache.shindig.social.opensocial.oauth;
-import com.google.inject.ImplementedBy;
-import org.apache.shindig.auth.SecurityToken;
-import org.apache.shindig.social.sample.oauth.SampleOAuthDataStore;
-
import net.oauth.OAuthConsumer;
-...@implementedby(SampleOAuthDataStore.class)
+import org.apache.shindig.auth.SecurityToken;
/**
* A class that manages the OAuth data for Shindig, including
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=755306&r1=755305&r2=755306&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
Tue Mar 17 16:24:20 2009
@@ -20,9 +20,6 @@
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.protocol.RestfulCollection;
import org.apache.shindig.social.opensocial.model.Activity;
-import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
-
-import com.google.inject.ImplementedBy;
import java.util.Set;
import java.util.concurrent.Future;
@@ -31,7 +28,6 @@
* The ActivityService interface defines the service provider interface to
retrieve activities from
* the underlying SNS.
*/
-...@implementedby(JsonDbOpensocialService.class)
public interface ActivityService {
/**
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=755306&r1=755305&r2=755306&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
Tue Mar 17 16:24:20 2009
@@ -19,9 +19,6 @@
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.protocol.DataCollection;
-import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
-
-import com.google.inject.ImplementedBy;
import java.util.Map;
import java.util.Set;
@@ -31,7 +28,6 @@
* Data Service SPI interface. This interface represents is used to retrieve
information bound to a
* person, there are methods to update and delete data.
*/
-...@implementedby(JsonDbOpensocialService.class)
public interface AppDataService {
/**
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=755306&r1=755305&r2=755306&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
Tue Mar 17 16:24:20 2009
@@ -20,15 +20,10 @@
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.protocol.RestfulCollection;
import org.apache.shindig.social.opensocial.model.Person;
-import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
-
-import com.google.inject.ImplementedBy;
import java.util.Set;
import java.util.concurrent.Future;
-...@implementedby(JsonDbOpensocialService.class)
-
public interface PersonService {
/**
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
Tue Mar 17 16:24:20 2009
@@ -31,6 +31,10 @@
import org.apache.shindig.social.opensocial.service.AppDataHandler;
import org.apache.shindig.social.opensocial.service.PersonHandler;
import org.apache.shindig.social.opensocial.service.MessageHandler;
+import org.apache.shindig.social.opensocial.spi.ActivityService;
+import org.apache.shindig.social.opensocial.spi.AppDataService;
+import org.apache.shindig.social.opensocial.spi.PersonService;
+import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
import com.google.common.collect.ImmutableSet;
import com.google.inject.AbstractModule;
@@ -49,6 +53,10 @@
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet"))
.to(DataServiceServletFetcher.class);
+ bind(ActivityService.class).to(JsonDbOpensocialService.class);
+ bind(AppDataService.class).to(JsonDbOpensocialService.class);
+ bind(PersonService.class).to(JsonDbOpensocialService.class);
+
bind(String.class).annotatedWith(Names.named("shindig.canonical.json.db"))
.toInstance("sampledata/canonicaldb.json");
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java?rev=755306&r1=755305&r2=755306&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
Tue Mar 17 16:24:20 2009
@@ -20,7 +20,10 @@
import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.PropertiesModule;
import org.apache.shindig.social.core.oauth.AuthenticationHandlerProvider;
+import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
+import org.easymock.EasyMock;
+import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Key;
@@ -34,7 +37,13 @@
@Override public void setUp() throws Exception {
super.setUp();
- injector = Guice.createInjector(new SocialApiGuiceModule(), new
PropertiesModule());
+ injector = Guice.createInjector(new SocialApiGuiceModule(), new
PropertiesModule(),
+ new AbstractModule() {
+ @Override
+ protected void configure() {
+
bind(OAuthDataStore.class).toInstance(EasyMock.createMock(OAuthDataStore.class));
+ }
+ });
}
/**
