svn commit: r950211 - in /shindig/trunk/java: server/src/main/java/org/apache/shindig/sample/container/ server/src/main/java/org/apache/shindig/sample/shiro/ server/src/main/webapp/WEB-INF/ social-api/ social-api/src/main/java/org/apache/shindig/social...

[li...@apache.org]

Author: lindner
Date: Tue Jun  1 19:08:49 2010
New Revision: 950211

URL: http://svn.apache.org/viewvc?rev=950211&view=rev
Log:
move SampleContainer code from social-api to server, rename ShiroModule to ShiroGuiceModule

Added:
    shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/
    shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java
      - copied, changed from r950101, shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroModule.java
    shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java
      - copied, changed from r950101, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
    shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroGuiceModule.java
      - copied, changed from r950101, shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroModule.java
Removed:
    shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroModule.java
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
Modified:
    shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
    shindig/trunk/java/social-api/pom.xml
    shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java

Copied: shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java (from r950101, shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroModule.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java?p2=shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java&p1=shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroModule.java&r1=950101&r2=950211&rev=950211&view=diff
==============================================================================
--- shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroModule.java (original)
+++ shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java Tue Jun  1 19:08:49 2010
@@ -15,13 +15,18 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package org.apache.shindig.sample.shiro;
+package org.apache.shindig.sample.container;
 import com.google.inject.AbstractModule;
+import com.google.inject.multibindings.Multibinder;
+import com.google.inject.name.Names;
+import org.apache.shindig.sample.shiro.SampleShiroRealm;
 
-public class ShiroModule extends AbstractModule {
+public class SampleContainerGuiceModule extends AbstractModule {
 
   protected void configure() {
     // We do this so that jsecurity realms can get access to the jsondbservice singleton
-    requestStaticInjection(SampleShiroRealm.class);
+
+    Multibinder<Object> handlerBinder = Multibinder.newSetBinder(binder(), Object.class, Names.named("org.apache.shindig.handlers"));
+    handlerBinder.addBinding().toInstance(SampleContainerHandler.class);
   }
-}
+}
\ No newline at end of file

Copied: shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java (from r950101, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java?p2=shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java&p1=shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java&r1=950101&r2=950211&rev=950211&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java (original)
+++ shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java Tue Jun  1 19:08:49 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package org.apache.shindig.social.sample.service;
+package org.apache.shindig.sample.container;
 
 import org.apache.shindig.common.util.ImmediateFuture;
 import org.apache.shindig.common.uri.Uri;

Copied: shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroGuiceModule.java (from r950101, shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroModule.java)
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroGuiceModule.java?p2=shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroGuiceModule.java&p1=shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroModule.java&r1=950101&r2=950211&rev=950211&view=diff
==============================================================================
--- shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroModule.java (original)
+++ shindig/trunk/java/server/src/main/java/org/apache/shindig/sample/shiro/ShiroGuiceModule.java Tue Jun  1 19:08:49 2010
@@ -18,7 +18,7 @@
 package org.apache.shindig.sample.shiro;
 import com.google.inject.AbstractModule;
 
-public class ShiroModule extends AbstractModule {
+public class ShiroGuiceModule extends AbstractModule {
 
   protected void configure() {
     // We do this so that jsecurity realms can get access to the jsondbservice singleton

Modified: shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=950211&r1=950210&r2=950211&view=diff
==============================================================================
--- shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml (original)
+++ shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Tue Jun  1 19:08:49 2010
@@ -36,7 +36,8 @@
       org.apache.shindig.social.sample.SampleModule:
       org.apache.shindig.gadgets.oauth.OAuthModule:
       org.apache.shindig.common.cache.ehcache.EhCacheModule:
-      org.apache.shindig.sample.shiro.ShiroModule:
+      org.apache.shindig.sample.shiro.ShiroGuiceModule:
+      org.apache.shindig.sample.shiro.SampleContainerGuiceModule:
       org.apache.shindig.extras.ShindigExtrasGuiceModule:
       org.apache.shindig.extras.as.ActivityStreamsGuiceModule
     </param-value>

Modified: shindig/trunk/java/social-api/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/pom.xml?rev=950211&r1=950210&r2=950211&view=diff
==============================================================================
--- shindig/trunk/java/social-api/pom.xml (original)
+++ shindig/trunk/java/social-api/pom.xml Tue Jun  1 19:08:49 2010
@@ -60,11 +60,6 @@
       <artifactId>shindig-common</artifactId>
     </dependency>
 
-      <dependency>
-        <groupId>org.apache.shindig</groupId>
-        <artifactId>shindig-gadgets</artifactId>
-      </dependency>
-
     <dependency>
       <groupId>org.apache.shindig</groupId>
       <artifactId>shindig-common</artifactId>
@@ -82,6 +77,10 @@
       <artifactId>guice</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.google.inject.extensions</groupId>
+      <artifactId>guice-multibindings</artifactId>
+    </dependency>
+    <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>

Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java?rev=950211&r1=950210&r2=950211&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java Tue Jun  1 19:08:49 2010
@@ -23,7 +23,6 @@ import org.apache.shindig.social.opensoc
 import org.apache.shindig.social.opensocial.spi.MessageService;
 import org.apache.shindig.social.opensocial.spi.PersonService;
 import org.apache.shindig.social.sample.oauth.SampleOAuthDataStore;
-import org.apache.shindig.social.sample.service.SampleContainerHandler;
 import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
 
 import com.google.inject.AbstractModule;
@@ -48,8 +47,5 @@ public class SampleModule extends Abstra
     bind(MessageService.class).to(JsonDbOpensocialService.class);
     
     bind(OAuthDataStore.class).to(SampleOAuthDataStore.class);
-
-    Multibinder<Object> handlerBinder = Multibinder.newSetBinder(binder(), Object.class, Names.named("org.apache.shindig.handlers"));
-    handlerBinder.addBinding().toInstance(SampleContainerHandler.class);
   }
 }