rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfrank...@apache.org
Subject svn commit: r1160794 - in /incubator/rave/trunk/rave-shindig: ./ src/main/java/org/apache/rave/gadgets/oauth/inject/ src/main/java/org/apache/rave/opensocial/service/impl/ src/main/java/org/apache/rave/os/ src/main/java/org/apache/shindig/social/openso...
Date Tue, 23 Aug 2011 16:51:38 GMT
Author: mfranklin
Date: Tue Aug 23 16:51:38 2011
New Revision: 1160794

URL: http://svn.apache.org/viewvc?rev=1160794&view=rev
Log:
Removing Shindig sample SPI implementations (Supports RAVE-13)

Added:
    incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/DefaultMediaItemService.java
Removed:
    incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/os/
    incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
    incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
    incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/JPASocialModule.java
    incubator/rave/trunk/rave-shindig/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
Modified:
    incubator/rave/trunk/rave-shindig/   (props changed)
    incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/gadgets/oauth/inject/OAuthGuiceModule.java
    incubator/rave/trunk/rave-shindig/src/main/resources/modules-context.xml
    incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml

Propchange: incubator/rave/trunk/rave-shindig/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 23 16:51:38 2011
@@ -7,3 +7,5 @@ target
 .project
 
 *.iml
+
+overlays

Modified: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/gadgets/oauth/inject/OAuthGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/gadgets/oauth/inject/OAuthGuiceModule.java?rev=1160794&r1=1160793&r2=1160794&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/gadgets/oauth/inject/OAuthGuiceModule.java
(original)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/gadgets/oauth/inject/OAuthGuiceModule.java
Tue Aug 23 16:51:38 2011
@@ -25,6 +25,8 @@ import org.apache.shindig.common.crypto.
 import org.apache.shindig.gadgets.oauth.OAuthFetcherConfig;
 import org.apache.shindig.gadgets.oauth.OAuthModule;
 import org.apache.shindig.gadgets.oauth.OAuthRequest;
+import org.apache.shindig.social.opensocial.oauth.OAuthDataStore;
+import org.apache.shindig.social.sample.oauth.SampleOAuthDataStore;
 
 /**
  * Replacement for the {@link org.apache.shindig.gadgets.oauth.OAuthModule}.
@@ -45,5 +47,10 @@ public class OAuthGuiceModule extends Ab
         bind(BlobCrypter.class).annotatedWith(Names.named(OAuthFetcherConfig.OAUTH_STATE_CRYPTER))
                 .toProvider(OAuthModule.OAuthCrypterProvider.class);
         bind(OAuthRequest.class).toProvider(OAuthModule.OAuthRequestProvider.class);
+
+        //Required for SampleOAuthDataStore
+        bind(String.class).annotatedWith(Names.named("shindig.canonical.json.db"))
+            .toInstance("sampledata/canonicaldb.json");
+        bind(OAuthDataStore.class).to(SampleOAuthDataStore.class);
     }
 }

Added: incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/DefaultMediaItemService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/DefaultMediaItemService.java?rev=1160794&view=auto
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/DefaultMediaItemService.java
(added)
+++ incubator/rave/trunk/rave-shindig/src/main/java/org/apache/rave/opensocial/service/impl/DefaultMediaItemService.java
Tue Aug 23 16:51:38 2011
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.rave.opensocial.service.impl;
+
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.protocol.ProtocolException;
+import org.apache.shindig.protocol.RestfulCollection;
+import org.apache.shindig.social.opensocial.model.MediaItem;
+import org.apache.shindig.social.opensocial.spi.CollectionOptions;
+import org.apache.shindig.social.opensocial.spi.GroupId;
+import org.apache.shindig.social.opensocial.spi.MediaItemService;
+import org.apache.shindig.social.opensocial.spi.UserId;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Set;
+import java.util.concurrent.Future;
+
+/**
+
+ */
+@Service
+public class DefaultMediaItemService implements MediaItemService {
+    @Override
+    public Future<MediaItem> getMediaItem(UserId userId, String appId, String albumId,
String mediaItemId, Set<String> fields, SecurityToken token) throws ProtocolException
{
+
+        throw new ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED, "Not Implemented");
+    }
+
+    @Override
+    public Future<RestfulCollection<MediaItem>> getMediaItems(UserId userId,
String appId, String albumId, Set<String> mediaItemIds, Set<String> fields, CollectionOptions
options, SecurityToken token) throws ProtocolException {
+
+        throw new ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED, "Not Implemented");
+    }
+
+    @Override
+    public Future<RestfulCollection<MediaItem>> getMediaItems(UserId userId,
String appId, String albumId, Set<String> fields, CollectionOptions options, SecurityToken
token) throws ProtocolException {
+
+        throw new ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED, "Not Implemented");
+    }
+
+    @Override
+    public Future<RestfulCollection<MediaItem>> getMediaItems(Set<UserId>
userIds, GroupId groupId, String appId, Set<String> fields, CollectionOptions options,
SecurityToken token) throws ProtocolException {
+
+        throw new ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED, "Not Implemented");
+    }
+
+    @Override
+    public Future<Void> deleteMediaItem(UserId userId, String appId, String albumId,
String mediaItemId, SecurityToken token) throws ProtocolException {
+
+        throw new ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED, "Not Implemented");
+    }
+
+    @Override
+    public Future<Void> createMediaItem(UserId userId, String appId, String albumId,
MediaItem mediaItem, SecurityToken token) throws ProtocolException {
+
+        throw new ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED, "Not Implemented");
+    }
+
+    @Override
+    public Future<Void> updateMediaItem(UserId userId, String appId, String albumId,
String mediaItemId, MediaItem mediaItem, SecurityToken token) throws ProtocolException {
+
+        throw new ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED, "Not Implemented");
+    }
+}

Modified: incubator/rave/trunk/rave-shindig/src/main/resources/modules-context.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/resources/modules-context.xml?rev=1160794&r1=1160793&r2=1160794&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/resources/modules-context.xml (original)
+++ incubator/rave/trunk/rave-shindig/src/main/resources/modules-context.xml Tue Aug 23 16:51:38
2011
@@ -22,8 +22,7 @@
 
     <!-- Define the Default Guice Modules Here-->
     <bean class="org.apache.rave.commoncontainer.ConfigurablePropertiesModule" />
-    <bean class="org.apache.rave.os.JPAOpenSocialModule" />
-    <bean class="org.apache.rave.os.SocialApiGuiceModule" />
+    <bean class="org.apache.shindig.social.core.config.SocialApiGuiceModule" />
     <bean class="org.apache.shindig.auth.ClasspathAwareDefaultSecurityTokenCodec$TemporarySecurityTokenGuiceModule"
/>
     <bean class="org.apache.rave.gadgets.oauth.inject.OAuthGuiceModule"/>
     <bean class="org.apache.shindig.gadgets.DefaultGuiceModule" />

Modified: incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml?rev=1160794&r1=1160793&r2=1160794&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
(original)
+++ incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
Tue Aug 23 16:51:38 2011
@@ -16,6 +16,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"



Mime
View raw message