From 859b2fdd465584ced39a00a470d482b4fc9f9a5c Mon Sep 17 00:00:00 2001
From: Paul Lindner <lindner@apache.org>
Date: Tue, 3 Feb 2009 00:47:12 +0000
Subject: [PATCH] SHINDIG-898 | fix for samples based on latest changes

git-svn-id: https://svn.apache.org/repos/asf/incubator/shindig/trunk@740168 13f79535-47bb-0310-9956-ffa450edef68
---
 .../jpa/spi/integration/JpaRestfulTestConfigHelper.java |  4 ++--
 .../jpa/spi/integration/JpaTestGuiceModule.java         | 17 +++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java b/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
index eb179785..0e7738f3 100644
--- a/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
+++ b/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulTestConfigHelper.java
@@ -24,7 +24,7 @@ import org.apache.shindig.social.core.util.BeanXStreamConverter;
 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.DataServiceServlet;
-import org.apache.shindig.social.opensocial.service.HandlerDispatcher;
+import org.apache.shindig.social.opensocial.service.HandlerRegistry;
 
 import javax.persistence.EntityManager;
 
@@ -57,7 +57,7 @@ public class JpaRestfulTestConfigHelper {
   protected static DataServiceServlet getDataServiceServlet(Injector injector) {
  // Set data service servlet again to use JPA guice dependencies
     DataServiceServlet servlet = new DataServiceServlet();
-    servlet.setHandlerDispatcher(injector.getInstance(HandlerDispatcher.class));
+    servlet.setHandlerRegistry(injector.getInstance(HandlerRegistry.class));
     servlet.setBeanConverters(new BeanJsonConverter(injector),
         new BeanXStreamConverter(new XStream081Configuration(injector)),
         new BeanXStreamAtomConverter(new XStream081Configuration(injector)));
diff --git a/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java b/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
index 1a8f5e5c..2bbc30d3 100644
--- a/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
+++ b/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
@@ -18,6 +18,12 @@
 
 package org.apache.shindig.social.opensocial.jpa.spi.integration;
 
+import javax.persistence.EntityManager;
+
+import org.apache.shindig.common.PropertiesModule;
+import org.apache.shindig.gadgets.DefaultGuiceModule;
+import org.apache.shindig.gadgets.oauth.OAuthModule;
+import org.apache.shindig.social.core.config.SocialApiGuiceModule;
 import org.apache.shindig.social.opensocial.jpa.AccountDb;
 import org.apache.shindig.social.opensocial.jpa.ActivityDb;
 import org.apache.shindig.social.opensocial.jpa.AddressDb;
@@ -43,18 +49,12 @@ import org.apache.shindig.social.opensocial.model.Name;
 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.service.PersonHandler;
 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 javax.persistence.EntityManager;
-
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
 import com.google.inject.Scopes;
-import com.google.inject.TypeLiteral;
 
 /**
  * Provides component injection for tests
@@ -76,6 +76,11 @@ public class JpaTestGuiceModule extends AbstractModule {
    */
   @Override
   protected void configure() {
+    install(new PropertiesModule());
+    install(new DefaultGuiceModule());
+    install(new SocialApiGuiceModule());
+    install(new OAuthModule());
+    
     // Entity manager
     this.bind(EntityManager.class).toInstance(this.entityManager);
     
-- 
2.11.4.GIT