svn commit: r1235006 - in /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet: GadgetsHandlerApi.java GadgetsHandlerService.java

[ddumont]

Author: ddumont
Date: Mon Jan 23 21:43:02 2012
New Revision: 1235006

URL: http://svn.apache.org/viewvc?rev=1235006&view=rev
Log:
SHINDIG-1684 Exposing the OAuth2 metadata to the Gadget container

Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java?rev=1235006&r1=1235005&r2=1235006&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
 Mon Jan 23 21:43:02 2012
@@ -23,7 +23,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.protocol.conversion.BeanFilter.Unfiltered;
 
@@ -164,6 +163,7 @@ public class GadgetsHandlerApi {
     public Map<String, Feature> getFeatures();
     public Map<String, LinkSpec> getLinks();
     public OAuthSpec getOAuthSpec();
+    public OAuth2Spec getOAuth2Spec();
     // TODO: Provide better interface for locale if needed
     // public Map<Locale, LocaleSpec> getLocales();
   }
@@ -184,6 +184,10 @@ public class GadgetsHandlerApi {
     public Map<String, OAuthService> getServices();
   }
 
+  public interface OAuth2Spec {
+           public Map<String, OAuth2Service> getServices();
+  }
+  
   public interface OAuthService {
     public EndPoint getRequestUrl();
     public EndPoint getAccessUrl();
@@ -197,6 +201,12 @@ public class GadgetsHandlerApi {
     public Location getLocation();
   }
 
+  public interface OAuth2Service {
+         public EndPoint getAuthorizationUrl();
+         public EndPoint getTokenUrl();
+         public String getScope();
+         public String getName();
+  }
   public interface TokenRequest extends BaseRequest {
     public AuthContext getAuthContext();
     public Long getModuleId();

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1235006&r1=1235005&r2=1235006&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
 Mon Jan 23 21:43:02 2012
@@ -60,6 +60,8 @@ import org.apache.shindig.gadgets.spec.F
 import org.apache.shindig.gadgets.spec.GadgetSpec;
 import org.apache.shindig.gadgets.spec.LinkSpec;
 import org.apache.shindig.gadgets.spec.ModulePrefs;
+import org.apache.shindig.gadgets.spec.OAuth2Service;
+import org.apache.shindig.gadgets.spec.OAuth2Spec;
 import org.apache.shindig.gadgets.spec.OAuthService;
 import org.apache.shindig.gadgets.spec.OAuthSpec;
 import org.apache.shindig.gadgets.spec.UserPref;
@@ -112,6 +114,8 @@ public class GadgetsHandlerService {
           .put(OAuthSpec.class, GadgetsHandlerApi.OAuthSpec.class)
           .put(OAuthService.class, GadgetsHandlerApi.OAuthService.class)
           .put(OAuthService.EndPoint.class, GadgetsHandlerApi.EndPoint.class)
+          .put(OAuth2Spec.class, GadgetsHandlerApi.OAuth2Spec.class)
+          .put(OAuth2Service.class, GadgetsHandlerApi.OAuth2Service.class)
           // Enums
           .put(View.ContentType.class, GadgetsHandlerApi.ViewContentType.class)
           .put(UserPref.DataType.class, 
GadgetsHandlerApi.UserPrefDataType.class)