svn commit: r701220 - /incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java

[beaton]

Author: beaton
Date: Thu Oct  2 12:29:10 2008
New Revision: 701220

URL: http://svn.apache.org/viewvc?rev=701220&view=rev
Log:
Patch from Adam Winer, fixes Shindig startup problem.


Modified:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java

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=701220&r1=701219&r2=701220&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
 Thu Oct  2 12:29:10 2008
@@ -28,11 +28,9 @@
 import org.apache.shindig.social.opensocial.service.BeanConverter;
 import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
 import org.apache.shindig.social.opensocial.service.HandlerProvider;
-import org.apache.shindig.social.sample.service.SampleContainerHandler;
+import org.apache.shindig.social.sample.service.SampleContainerHandlerProvider;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Names;
 
@@ -49,7 +47,7 @@
   /** [EMAIL PROTECTED] */
   @Override
   protected void configure() {
-    bind(HandlerProvider.class).toProvider(HandlerProviderProvider.class);
+    bind(HandlerProvider.class).to(SampleContainerHandlerProvider.class);
 
     
bind(ParameterFetcher.class).annotatedWith(Names.named("DataServiceServlet"))
         .to(DataServiceServletFetcher.class);
@@ -71,25 +69,4 @@
     bind(new TypeLiteral<List<AuthenticationHandler>>(){}).toProvider(
         AuthenticationHandlerProvider.class);
   }
-
-  /**
-   * Provider for the HandlerProvider.  Adds the sample container handler
-   * at "samplecontainer".
-   */
-  static class HandlerProviderProvider implements Provider<HandlerProvider> {
-    private final HandlerProvider handlerProvider;
-    private final Provider<SampleContainerHandler> sampleHandler;
-
-    @Inject
-    public HandlerProviderProvider(HandlerProvider handlerProvider,
-        Provider<SampleContainerHandler> sampleHandler) {
-      this.handlerProvider = handlerProvider;
-      this.sampleHandler = sampleHandler;
-    }
-
-    public HandlerProvider get() {
-      handlerProvider.addHandler("samplecontainer", sampleHandler);
-      return handlerProvider;
-    }
-  }
 }