svn commit: r740168 - in /incubator/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration: JpaRestfulTestConfigHelper.java JpaTestGuiceModule.java

[li...@apache.org]

Author: lindner
Date: Tue Feb  3 00:47:12 2009
New Revision: 740168

URL: http://svn.apache.org/viewvc?rev=740168&view=rev
Log:
SHINDIG-898 | fix for samples based on latest changes

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

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=740168&r1=740167&r2=740168&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 Feb  3 00:47:12 2009
@@ -24,7 +24,7 @@
 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 @@
   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)));

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=740168&r1=740167&r2=740168&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 Feb  3 00:47:12 2009
@@ -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.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 @@
    */
   @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);