You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/08/31 12:02:19 UTC
svn commit: r690671 - in /incubator/shindig/trunk/java: common/src/main/java/org/apache/shindig/auth/ common/src/main/java/org/apache/shindig/common/ common/src/main/java/org/apache/shindig/common/testing/ common/src/test/java/org/apache/shindig/auth/ ...

Author: etnu
Date: Sun Aug 31 03:02:17 2008
New Revision: 690671

URL: http://svn.apache.org/viewvc?rev=690671&view=rev
Log:
Patch for SHINDIG-556. Moves all remaining security token code to org.apache.shindig.auth.

This patch looks very large due to the package name change.


Added:
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
      - copied, changed from r690646, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/AnonymousSecurityToken.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
      - copied, changed from r690075, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityToken.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java
      - copied, changed from r690646, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java
      - copied, changed from r690075, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityToken.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java
      - copied, changed from r690075, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java
      - copied, changed from r690075, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenException.java
Removed:
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/AnonymousSecurityToken.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityToken.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityToken.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenException.java
Modified:
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
    incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java
    incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ContentFetcherFactory.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetchParams.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcherFactory.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetchParamsTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
    incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthLookupService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
    incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java Sun Aug 31 03:02:17 2008
@@ -17,9 +17,6 @@
  */
 package org.apache.shindig.auth;
 
-import org.apache.shindig.common.AnonymousSecurityToken;
-import org.apache.shindig.common.SecurityToken;
-
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
 

Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java (from r690646, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/AnonymousSecurityToken.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java&p1=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/AnonymousSecurityToken.java&r1=690646&r2=690671&rev=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/AnonymousSecurityToken.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java Sun Aug 31 03:02:17 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.common;
+package org.apache.shindig.auth;
 
 /**
  * A special class of Token representing the anonymous viewer/owner

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java Sun Aug 31 03:02:17 2008
@@ -17,8 +17,6 @@
  */
 package org.apache.shindig.auth;
 
-import org.apache.shindig.common.SecurityToken;
-
 import javax.servlet.http.HttpServletRequest;
 
 /**

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java Sun Aug 31 03:02:17 2008
@@ -17,8 +17,6 @@
  */
 package org.apache.shindig.auth;
 
-import org.apache.shindig.common.SecurityToken;
-
 import javax.servlet.http.HttpServletRequest;
 
 /**

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java Sun Aug 31 03:02:17 2008
@@ -17,7 +17,6 @@
  */
 package org.apache.shindig.auth;
 
-import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.common.servlet.InjectedFilter;
 
 import com.google.inject.Inject;

Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java (from r690075, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityToken.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java&p1=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityToken.java&r1=690075&r2=690671&rev=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityToken.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java Sun Aug 31 03:02:17 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.common;
+package org.apache.shindig.auth;
 
 import org.apache.shindig.common.crypto.BasicBlobCrypter;
 import org.apache.shindig.common.crypto.BlobCrypter;
@@ -31,23 +31,23 @@
 public class BasicSecurityToken implements SecurityToken {
   /** serialized form of the token */
   private final String token;
-  
+
   /** data from the token */
   private final Map<String, String> tokenData;
-  
+
   /** tool to use for signing and encrypting the token */
   private BlobCrypter crypter = new BasicBlobCrypter(INSECURE_KEY);
-  
+
   private static final byte[] INSECURE_KEY =
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  
+
   private static final String OWNER_KEY = "o";
   private static final String APP_KEY = "a";
   private static final String VIEWER_KEY = "v";
   private static final String DOMAIN_KEY = "d";
   private static final String APPURL_KEY = "u";
   private static final String MODULE_KEY = "m";
-  
+
   /**
    * {@inheritDoc}
    */
@@ -59,14 +59,14 @@
    * Generates a token from an input string
    * @param token String form of token
    * @param maxAge max age of the token (in seconds)
-   * @throws BlobCrypterException 
+   * @throws BlobCrypterException
    */
   public BasicSecurityToken(String token, int maxAge)
   throws BlobCrypterException {
     this.token = token;
     this.tokenData = crypter.unwrap(token, maxAge);
   }
-  
+
   public BasicSecurityToken(String owner, String viewer, String app,
       String domain, String appUrl, String moduleId) throws BlobCrypterException {
     tokenData = new HashMap<String, String>(5,1);
@@ -120,14 +120,14 @@
   public long getModuleId() {
     return Long.parseLong(tokenData.get(MODULE_KEY));
   }
-  
+
   /**
    * {@inheritDoc}
    */
   public String getUpdatedToken() {
     return null;
   }
-  
+
   /**
    * {@inheritDoc}
    */

Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java (from r690646, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java&p1=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java&r1=690646&r2=690671&rev=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java Sun Aug 31 03:02:17 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.common;
+package org.apache.shindig.auth;
 
 import org.apache.shindig.common.crypto.BlobCrypterException;
 

Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java (from r690075, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityToken.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java&p1=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityToken.java&r1=690075&r2=690671&rev=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityToken.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java Sun Aug 31 03:02:17 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.common;
+package org.apache.shindig.auth;
 
 /**
  * An abstract representation of a signing token.
@@ -47,7 +47,7 @@
    * @return the application id from the token, or null if there is none.
    */
   public String getAppId();
-  
+
   /**
    * @return the domain from the token, or null if there is none.
    */
@@ -62,7 +62,7 @@
    * @return the module ID of the application
    */
   public long getModuleId();
-  
+
   /**
    * @return an updated version of the token to return to the gadget, or null
    * if there is no need to update the token.

Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java (from r690075, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java&p1=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java&r1=690075&r2=690671&rev=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java Sun Aug 31 03:02:17 2008
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.shindig.common;
+package org.apache.shindig.auth;
 
 import com.google.inject.ImplementedBy;
 
@@ -25,9 +25,7 @@
 /**
  *  Handles verification of gadget security tokens.
  */
-
 @ImplementedBy(BasicSecurityTokenDecoder.class)
-
 public interface SecurityTokenDecoder {
 
   /**

Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java (from r690075, incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenException.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java&p1=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenException.java&r1=690075&r2=690671&rev=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/SecurityTokenException.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java Sun Aug 31 03:02:17 2008
@@ -16,8 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-package org.apache.shindig.common;
+package org.apache.shindig.auth;
 
 /**
  * Exceptions thrown by SecurityTokenDecoder implementations.

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java Sun Aug 31 03:02:17 2008
@@ -17,10 +17,6 @@
  */
 package org.apache.shindig.auth;
 
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.SecurityTokenDecoder;
-import org.apache.shindig.common.SecurityTokenException;
-
 import com.google.inject.Inject;
 
 import java.util.Collections;

Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/testing/FakeGadgetToken.java Sun Aug 31 03:02:17 2008
@@ -18,10 +18,10 @@
  */
 package org.apache.shindig.common.testing;
 
-import com.google.common.collect.Maps;
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.auth.SecurityTokenDecoder;
 
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.SecurityTokenDecoder;
+import com.google.common.collect.Maps;
 
 import java.util.Map;
 
@@ -32,7 +32,7 @@
 
   private String updatedToken = null;
   private String trustedJson = null;
-  
+
   private String ownerId = null;
   private String viewerId = null;
   private String appId = null;
@@ -119,58 +119,58 @@
   public boolean isAnonymous() {
     return false;
   }
-  
+
   /**
-   * Create a fake security token parameter string, allows passing around a 
+   * Create a fake security token parameter string, allows passing around a
    * security token of format key=value&key2=value2, where key is one of:
    * ownerId, viewerId, domain, appUrl, appId, trustedJson, module.
-   * 
+   *
    * Useful for creating tokens that can be decoded with FakeGadgetToken.Decoder
-   * 
+   *
    * @param tokenString the parameter string
    * @return The fake token
    */
   public static SecurityToken createToken(String tokenString)  {
     String keyValuePairs[] = tokenString.split("&");
     Map<String, String> paramMap = Maps.newHashMap();
-    
+
     for (String keyValuePair : keyValuePairs) {
       String[] keyAndValue = keyValuePair.split("=");
       if (keyAndValue.length == 2) {
         paramMap.put(keyAndValue[0], keyAndValue[1]);
       }
     }
-    
+
     return createToken(paramMap);
   }
-  
+
   /**
    * Create a fake security token from a map of parameter strings, keys are one of:
    * ownerId, viewerId, domain, appUrl, appId, trustedJson, module
-   * 
+   *
    * @param paramMap
    * @return The fake token
    */
   public static SecurityToken createToken(Map<String, String> paramMap) {
     FakeGadgetToken fakeToken = new FakeGadgetToken();
-    
+
     fakeToken.setAppId(paramMap.get("appId"));
     fakeToken.setAppUrl(paramMap.get("appUrl"));
     fakeToken.setDomain(paramMap.get("domain"));
     fakeToken.setOwnerId(paramMap.get("ownerId"));
     fakeToken.setTrustedJson(paramMap.get("trustedJson"));
     fakeToken.setViewerId(paramMap.get("viewerId"));
-    
+
     String moduleIdStr = paramMap.get("module");
     if (moduleIdStr != null) {
       fakeToken.setModuleId(Integer.parseInt(moduleIdStr));
     }
-    
+
     return fakeToken;
   }
-  
+
   /**
-   * SecurityTokenDecoder for testing - this allows passing around a 
+   * SecurityTokenDecoder for testing - this allows passing around a
    * security token of format key=value&key2=value2, where key is one of:
    * ownerId, viewerId, domain, appUrl, appId, trustedJson, module
    */
@@ -179,5 +179,5 @@
       return FakeGadgetToken.createToken(tokenParameters);
     }
   }
-  
+
 }

Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java Sun Aug 31 03:02:17 2008
@@ -17,7 +17,6 @@
  */
 package org.apache.shindig.auth;
 
-import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.common.testing.FakeGadgetToken;
 import org.apache.shindig.common.testing.FakeHttpServletRequest;
 

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java Sun Aug 31 03:02:17 2008
@@ -17,8 +17,8 @@
  */
 package org.apache.shindig.gadgets;
 
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.ContainerConfig;
-import org.apache.shindig.common.SecurityToken;
 import org.apache.shindig.gadgets.spec.GadgetSpec;
 
 import java.net.URI;

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java Sun Aug 31 03:02:17 2008
@@ -14,7 +14,7 @@
 
 package org.apache.shindig.gadgets;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.crypto.Crypto;
 import org.apache.shindig.common.uri.UriBuilder;
 import org.apache.shindig.common.util.TimeSource;

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcherFactory.java Sun Aug 31 03:02:17 2008
@@ -18,7 +18,7 @@
  */
 package org.apache.shindig.gadgets;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.util.ResourceLoader;
 import org.apache.shindig.gadgets.http.HttpCache;
 import org.apache.shindig.gadgets.http.HttpFetcher;
@@ -85,7 +85,7 @@
     try {
       privateKey = IOUtils.toString(ResourceLoader.open(keyFile), "UTF-8");
       // Support standard openssl keys by stripping out the headers and blank lines
-      privateKey = privateKey.replaceAll("-----[A-Z ]*-----", "").replace("\n", ""); 
+      privateKey = privateKey.replaceAll("-----[A-Z ]*-----", "").replace("\n", "");
     } catch (IOException e) {
       privateKey = "";
     }

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ContentFetcherFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ContentFetcherFactory.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ContentFetcherFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ContentFetcherFactory.java Sun Aug 31 03:02:17 2008
@@ -17,11 +17,11 @@
  */
 package org.apache.shindig.gadgets.http;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.gadgets.GadgetException;
 import org.apache.shindig.gadgets.SigningFetcherFactory;
-import org.apache.shindig.gadgets.oauth.OAuthFetcherFactory;
 import org.apache.shindig.gadgets.oauth.OAuthArguments;
+import org.apache.shindig.gadgets.oauth.OAuthFetcherFactory;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java Sun Aug 31 03:02:17 2008
@@ -18,13 +18,15 @@
  */
 package org.apache.shindig.gadgets.http;
 
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.common.ContainerConfig;
+import org.apache.shindig.common.uri.Uri;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.shindig.common.ContainerConfig;
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.uri.Uri;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetchParams.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetchParams.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetchParams.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetchParams.java Sun Aug 31 03:02:17 2008
@@ -19,14 +19,14 @@
 
 package org.apache.shindig.gadgets.oauth;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 
 /**
  * Holds per-request configuration for an OAuth fetch.  Some of this is
  * sent directly from the client, other bits are calculated.
  */
 public class OAuthFetchParams {
-  
+
   private final OAuthArguments arguments;
   private final OAuthClientState clientState;
   private final SecurityToken authToken;
@@ -37,15 +37,15 @@
     this.clientState = clientState;
     this.authToken = authToken;
   }
-  
+
   public OAuthArguments getArguments() {
     return arguments;
   }
-  
+
   public OAuthClientState getClientState() {
     return clientState;
   }
-  
+
   public SecurityToken getAuthToken() {
     return authToken;
   }

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java Sun Aug 31 03:02:17 2008
@@ -16,12 +16,7 @@
  */
 package org.apache.shindig.gadgets.oauth;
 
-import net.oauth.OAuth;
-import net.oauth.OAuthAccessor;
-import net.oauth.OAuthException;
-import net.oauth.OAuthMessage;
-import net.oauth.OAuthProblemException;
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.gadgets.ChainedContentFetcher;
 import org.apache.shindig.gadgets.GadgetException;
@@ -31,6 +26,12 @@
 import org.apache.shindig.gadgets.http.HttpResponse;
 import org.apache.shindig.gadgets.http.HttpResponseBuilder;
 
+import net.oauth.OAuth;
+import net.oauth.OAuthAccessor;
+import net.oauth.OAuthException;
+import net.oauth.OAuthMessage;
+import net.oauth.OAuthProblemException;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcherFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcherFactory.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcherFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcherFactory.java Sun Aug 31 03:02:17 2008
@@ -18,7 +18,7 @@
  */
 package org.apache.shindig.gadgets.oauth;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.crypto.BasicBlobCrypter;
 import org.apache.shindig.common.crypto.BlobCrypter;
 import org.apache.shindig.common.crypto.Crypto;

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java Sun Aug 31 03:02:17 2008
@@ -19,9 +19,9 @@
 
 package org.apache.shindig.gadgets.servlet;
 
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.auth.SecurityTokenDecoder;
 import org.apache.shindig.common.ContainerConfig;
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.SecurityTokenDecoder;
 import org.apache.shindig.common.util.Utf8UrlCoder;
 import org.apache.shindig.gadgets.Gadget;
 import org.apache.shindig.gadgets.GadgetContentFilter;

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java Sun Aug 31 03:02:17 2008
@@ -19,9 +19,9 @@
 
 package org.apache.shindig.gadgets.servlet;
 
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.SecurityTokenDecoder;
-import org.apache.shindig.common.SecurityTokenException;
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.auth.SecurityTokenDecoder;
+import org.apache.shindig.auth.SecurityTokenException;
 import org.apache.shindig.gadgets.GadgetContext;
 import org.apache.shindig.gadgets.GadgetException;
 import org.apache.shindig.gadgets.RenderingContext;

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java Sun Aug 31 03:02:17 2008
@@ -18,9 +18,9 @@
  */
 package org.apache.shindig.gadgets.servlet;
 
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.SecurityTokenDecoder;
-import org.apache.shindig.common.SecurityTokenException;
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.auth.SecurityTokenDecoder;
+import org.apache.shindig.auth.SecurityTokenException;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.common.util.Utf8UrlCoder;
 import org.apache.shindig.gadgets.FeedProcessor;

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java Sun Aug 31 03:02:17 2008
@@ -21,8 +21,8 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
 
-import org.apache.shindig.common.BasicSecurityToken;
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.BasicSecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.crypto.BlobCrypterException;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.gadgets.http.HttpRequest;

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java Sun Aug 31 03:02:17 2008
@@ -19,11 +19,11 @@
 
 package org.apache.shindig.gadgets;
 
+import org.apache.shindig.auth.SecurityTokenDecoder;
 import org.apache.shindig.common.ContainerConfig;
-import org.apache.shindig.common.SecurityTokenDecoder;
-import org.apache.shindig.common.testing.TestExecutorService;
 import org.apache.shindig.common.cache.CacheProvider;
 import org.apache.shindig.common.cache.DefaultCacheProvider;
+import org.apache.shindig.common.testing.TestExecutorService;
 import org.apache.shindig.common.util.FakeTimeSource;
 import org.apache.shindig.gadgets.http.ContentFetcherFactory;
 import org.apache.shindig.gadgets.http.HttpFetcher;

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java Sun Aug 31 03:02:17 2008
@@ -19,11 +19,11 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.shindig.common.BasicSecurityToken;
-import org.apache.shindig.common.uri.Uri;
-import org.apache.shindig.common.uri.UriBuilder;
+import org.apache.shindig.auth.BasicSecurityToken;
 import org.apache.shindig.common.cache.CacheProvider;
 import org.apache.shindig.common.cache.DefaultCacheProvider;
+import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.common.uri.UriBuilder;
 import org.apache.shindig.gadgets.http.BasicHttpCache;
 import org.apache.shindig.gadgets.http.HttpCache;
 import org.apache.shindig.gadgets.http.HttpRequest;

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java Sun Aug 31 03:02:17 2008
@@ -21,7 +21,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.apache.shindig.common.AnonymousSecurityToken;
+import org.apache.shindig.auth.AnonymousSecurityToken;
 import org.apache.shindig.common.uri.Uri;
 
 import org.apache.commons.io.IOUtils;

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTest.java Sun Aug 31 03:02:17 2008
@@ -21,13 +21,14 @@
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
 
+import org.apache.shindig.auth.SecurityTokenDecoder;
+
 import junit.framework.TestCase;
 
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthServiceProvider;
 import net.oauth.signature.RSA_SHA1;
 
-import org.apache.shindig.common.SecurityTokenDecoder;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
 

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetchParamsTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetchParamsTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetchParamsTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetchParamsTest.java Sun Aug 31 03:02:17 2008
@@ -21,7 +21,8 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
+
 import org.easymock.classextension.EasyMock;
 import org.junit.Test;
 

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java Sun Aug 31 03:02:17 2008
@@ -21,8 +21,8 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import org.apache.shindig.common.BasicSecurityToken;
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.BasicSecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.cache.DefaultCacheProvider;
 import org.apache.shindig.common.crypto.BasicBlobCrypter;
 import org.apache.shindig.common.uri.Uri;

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java Sun Aug 31 03:02:17 2008
@@ -18,9 +18,13 @@
  */
 package org.apache.shindig.gadgets.servlet;
 
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.isA;
+
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.auth.SecurityTokenDecoder;
 import org.apache.shindig.common.ContainerConfig;
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.SecurityTokenDecoder;
 import org.apache.shindig.common.testing.FakeGadgetToken;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.common.util.Utf8UrlCoder;
@@ -33,10 +37,8 @@
 import org.apache.shindig.gadgets.oauth.OAuthFetcher;
 import org.apache.shindig.gadgets.oauth.OAuthResponseParams;
 import org.apache.shindig.gadgets.spec.GadgetSpec;
+
 import org.easymock.EasyMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.isA;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -45,7 +47,7 @@
 import java.util.Enumeration;
 
 public class GadgetRenderingTaskTest extends ServletTestFixture {
-  
+
   final static Enumeration<String> EMPTY_PARAMS = new Enumeration<String>() {
     public boolean hasMoreElements() {
       return false;
@@ -147,7 +149,7 @@
     String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW, SPEC_XML);
     assertTrue(content.contains("<script src=\"" + jsLibs + "\">"));
   }
-  
+
   public void testViewAliases() throws Exception {
     JSONArray aliases = new JSONArray().put("ALIAS");
     expect(containerConfig.getJsonArray(ContainerConfig.DEFAULT_CONTAINER,

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java Sun Aug 31 03:02:17 2008
@@ -18,11 +18,13 @@
  */
 package org.apache.shindig.gadgets.servlet;
 
-import com.google.common.collect.Lists;
 import static junitx.framework.StringAssert.assertStartsWith;
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.SecurityTokenDecoder;
-import org.apache.shindig.common.SecurityTokenException;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
+
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.auth.SecurityTokenDecoder;
+import org.apache.shindig.auth.SecurityTokenException;
 import org.apache.shindig.common.testing.FakeGadgetToken;
 import org.apache.shindig.common.uri.Uri;
 import org.apache.shindig.gadgets.GadgetException;
@@ -32,8 +34,9 @@
 import org.apache.shindig.gadgets.http.HttpResponseBuilder;
 import org.apache.shindig.gadgets.spec.Auth;
 import org.apache.shindig.gadgets.spec.Preload;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
+
+import com.google.common.collect.Lists;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -363,7 +366,7 @@
         .setResponse("foo".getBytes("UTF-8"))
         .setMetadata("foo", RESPONSE_BODY)
         .create();
-    
+
     expect(fetcher.fetch(internalRequest)).andReturn(response);
     replay();
 

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java Sun Aug 31 03:02:17 2008
@@ -23,13 +23,14 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.isA;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.util.DateUtil;
 import org.apache.shindig.gadgets.GadgetException;
 import org.apache.shindig.gadgets.GadgetTestFixture;
 import org.apache.shindig.gadgets.oauth.OAuthArguments;
 
+import org.apache.commons.lang.StringUtils;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -37,9 +38,9 @@
  * Contains everything needed for making servlet requests.
  */
 public class ServletTestFixture extends GadgetTestFixture {
-  
+
   private final long testStartTime = timeSource.currentTimeMillis();
-  
+
   public ServletTestFixture() {
     try {
       // TODO: This is horrible. It needs to be fixed.

Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java (original)
+++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java Sun Aug 31 03:02:17 2008
@@ -17,21 +17,23 @@
  */
 package org.apache.shindig.server.endtoend;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+
+import org.apache.shindig.auth.BasicSecurityToken;
+import org.apache.shindig.auth.BasicSecurityTokenDecoder;
+import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.common.crypto.BlobCrypterException;
+
 import com.gargoylesoftware.htmlunit.CollectingAlertHandler;
 import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
 import com.gargoylesoftware.htmlunit.Page;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
-import org.apache.shindig.common.BasicSecurityToken;
-import org.apache.shindig.common.BasicSecurityTokenDecoder;
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.crypto.BlobCrypterException;
 import org.junit.After;
 import org.junit.AfterClass;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java Sun Aug 31 03:02:17 2008
@@ -18,7 +18,7 @@
 package org.apache.shindig.social.core.oauth;
 
 import org.apache.shindig.auth.AuthenticationHandler;
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.social.opensocial.oauth.OAuthLookupService;
 
 import com.google.inject.Inject;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java Sun Aug 31 03:02:17 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.shindig.social.core.oauth;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 
 public class OAuthSecurityToken implements SecurityToken {
   private final String userId;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthLookupService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthLookupService.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthLookupService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthLookupService.java Sun Aug 31 03:02:17 2008
@@ -17,10 +17,11 @@
  */
 package org.apache.shindig.social.opensocial.oauth;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.social.sample.oauth.SampleContainerOAuthLookupService;
 
 import com.google.inject.ImplementedBy;
+
 import net.oauth.OAuthMessage;
 
 @ImplementedBy(SampleContainerOAuthLookupService.class)

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java Sun Aug 31 03:02:17 2008
@@ -19,8 +19,8 @@
 
 import org.apache.shindig.social.opensocial.model.Activity;
 import org.apache.shindig.social.opensocial.spi.ActivityService;
-import org.apache.shindig.social.opensocial.spi.UserId;
 import org.apache.shindig.social.opensocial.spi.SocialSpiException;
+import org.apache.shindig.social.opensocial.spi.UserId;
 
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
@@ -45,6 +45,7 @@
    *
    * examples: /activities/john.doe/@self/1
    */
+  @Override
   protected Future<?> handleDelete(RequestItem request)
       throws SocialSpiException {
     request.applyUrlTemplate(ACTIVITY_ID_PATH);
@@ -64,6 +65,7 @@
    *
    * examples: /activities/john.doe/@self - postBody is an activity object
    */
+  @Override
   protected Future<?> handlePut(RequestItem request) throws SocialSpiException {
     return handlePost(request);
   }
@@ -73,6 +75,7 @@
    *
    * examples: /activities/john.doe/@self - postBody is an activity object
    */
+  @Override
   protected Future<?> handlePost(RequestItem request) throws SocialSpiException {
     request.applyUrlTemplate(ACTIVITY_ID_PATH);
 
@@ -97,6 +100,7 @@
    * examples: /activities/john.doe/@self/1 /activities/john.doe/@self
    * /activities/john.doe,jane.doe/@friends
    */
+  @Override
   protected Future<?> handleGet(RequestItem request)
       throws SocialSpiException {
     request.applyUrlTemplate(ACTIVITY_ID_PATH);

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java Sun Aug 31 03:02:17 2008
@@ -18,7 +18,7 @@
 package org.apache.shindig.social.opensocial.service;
 
 import org.apache.shindig.auth.AuthInfo;
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.servlet.InjectedServlet;
 import org.apache.shindig.common.util.ImmediateFuture;
 import org.apache.shindig.social.ResponseError;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java Sun Aug 31 03:02:17 2008
@@ -19,8 +19,8 @@
 
 import org.apache.shindig.social.ResponseError;
 import org.apache.shindig.social.opensocial.spi.AppDataService;
-import org.apache.shindig.social.opensocial.spi.UserId;
 import org.apache.shindig.social.opensocial.spi.SocialSpiException;
+import org.apache.shindig.social.opensocial.spi.UserId;
 
 import com.google.inject.Inject;
 
@@ -49,6 +49,7 @@
    * values and set on the person object. If there are no fields vars then all of the data will be
    * overridden.
    */
+  @Override
   protected Future<?> handleDelete(RequestItem request)
       throws SocialSpiException {
     request.applyUrlTemplate(APP_DATA_PATH);
@@ -71,6 +72,7 @@
    * values and set on the person object. If there are no fields vars then all of the data will be
    * overridden.
    */
+  @Override
   protected Future<?> handlePut(RequestItem request) throws SocialSpiException {
     return handlePost(request);
   }
@@ -83,6 +85,7 @@
    * The post data should be a regular json object. All of the fields vars will be pulled from the
    * values and set. If there are no fields vars then all of the data will be overridden.
    */
+  @Override
   protected Future<?> handlePost(RequestItem request) throws SocialSpiException {
     request.applyUrlTemplate(APP_DATA_PATH);
 
@@ -108,6 +111,7 @@
    *
    * examples: /appdata/john.doe/@friends/app?fields=count /appdata/john.doe/@self/app
    */
+  @Override
   protected Future<?> handleGet(RequestItem request) throws SocialSpiException {
     request.applyUrlTemplate(APP_DATA_PATH);
 

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java Sun Aug 31 03:02:17 2008
@@ -17,15 +17,16 @@
  */
 package org.apache.shindig.social.opensocial.service;
 
-import com.google.common.collect.Maps;
-
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.social.opensocial.spi.RestfulCollection;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.social.opensocial.spi.DataCollection;
+import org.apache.shindig.social.opensocial.spi.RestfulCollection;
+
+import com.google.common.collect.Maps;
 
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.logging.Logger;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -42,24 +43,28 @@
   private static final Logger logger = Logger.getLogger(
       "org.apache.shindig.social.opensocial.spi");
 
+  @Override
   protected void doGet(HttpServletRequest servletRequest,
       HttpServletResponse servletResponse)
       throws ServletException, IOException {
     doPost(servletRequest, servletResponse);
   }
 
+  @Override
   protected void doPut(HttpServletRequest servletRequest,
       HttpServletResponse servletResponse)
       throws ServletException, IOException {
     doPost(servletRequest, servletResponse);
   }
 
+  @Override
   protected void doDelete(HttpServletRequest servletRequest,
       HttpServletResponse servletResponse)
       throws ServletException, IOException {
     doPost(servletRequest, servletResponse);
   }
 
+  @Override
   protected void doPost(HttpServletRequest servletRequest,
       HttpServletResponse servletResponse)
       throws ServletException, IOException {
@@ -78,6 +83,7 @@
     handleSingleRequest(servletRequest, servletResponse, token, converter);
   }
 
+  @Override
   protected void sendError(HttpServletResponse servletResponse, ResponseItem responseItem)
       throws IOException {
     servletResponse.sendError(responseItem.getError().getHttpErrorCode(),
@@ -100,7 +106,7 @@
       if (!(response instanceof DataCollection) && !(response instanceof RestfulCollection)) {
         response = Maps.immutableMap("entry", response);
       }
-      
+
       writer.write(converter.convertToString(response));
     } else {
       sendError(servletResponse, responseItem);

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServletFetcher.java Sun Aug 31 03:02:17 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.shindig.social.opensocial.service;
 
-import org.apache.shindig.common.SecurityTokenDecoder;
+import org.apache.shindig.auth.SecurityTokenDecoder;
 import org.apache.shindig.common.servlet.ParameterFetcher;
 
 import com.google.common.collect.Maps;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java Sun Aug 31 03:02:17 2008
@@ -17,11 +17,11 @@
  */
 package org.apache.shindig.social.opensocial.service;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.util.JsonConversionUtil;
 import org.apache.shindig.social.ResponseError;
-import org.apache.shindig.social.opensocial.spi.RestfulCollection;
 import org.apache.shindig.social.opensocial.spi.DataCollection;
+import org.apache.shindig.social.opensocial.spi.RestfulCollection;
 
 import com.google.common.collect.Lists;
 
@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.Future;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -43,6 +44,7 @@
  */
 public class JsonRpcServlet extends ApiServlet {
 
+  @Override
   protected void doGet(HttpServletRequest servletRequest,
       HttpServletResponse servletResponse)
       throws ServletException, IOException {
@@ -59,6 +61,7 @@
     }
   }
 
+  @Override
   protected void doPost(HttpServletRequest servletRequest,
       HttpServletResponse servletResponse)
       throws ServletException, IOException {
@@ -167,6 +170,7 @@
     return error;
   }
 
+  @Override
   protected void sendError(HttpServletResponse servletResponse, ResponseItem responseItem)
       throws IOException {
     try {

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java Sun Aug 31 03:02:17 2008
@@ -22,8 +22,8 @@
 import org.apache.shindig.social.opensocial.spi.CollectionOptions;
 import org.apache.shindig.social.opensocial.spi.GroupId;
 import org.apache.shindig.social.opensocial.spi.PersonService;
-import org.apache.shindig.social.opensocial.spi.UserId;
 import org.apache.shindig.social.opensocial.spi.SocialSpiException;
+import org.apache.shindig.social.opensocial.spi.UserId;
 
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
@@ -43,14 +43,17 @@
     this.personService = personService;
   }
 
+  @Override
   protected Future<?> handleDelete(RequestItem request) throws SocialSpiException {
     throw new SocialSpiException(ResponseError.BAD_REQUEST, "You can't delete people.");
   }
 
+  @Override
   protected Future<?> handlePut(RequestItem request) throws SocialSpiException {
     throw new SocialSpiException(ResponseError.NOT_IMPLEMENTED, "You can't update right now.");
   }
 
+  @Override
   protected Future<?> handlePost(RequestItem request) throws SocialSpiException {
     throw new SocialSpiException(ResponseError.NOT_IMPLEMENTED, "You can't add people right now.");
   }
@@ -60,6 +63,7 @@
    *
    * examples: /people/john.doe/@all /people/john.doe/@friends /people/john.doe/@self
    */
+  @Override
   protected Future<?> handleGet(RequestItem request) throws SocialSpiException {
     request.applyUrlTemplate(PEOPLE_PATH);
 

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RequestItem.java Sun Aug 31 03:02:17 2008
@@ -17,13 +17,13 @@
  */
 package org.apache.shindig.social.opensocial.service;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.social.opensocial.spi.GroupId;
 import org.apache.shindig.social.opensocial.spi.PersonService;
 import org.apache.shindig.social.opensocial.spi.UserId;
 
-import com.google.common.collect.Sets;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 
 import java.util.List;
 import java.util.Set;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RestfulRequestItem.java Sun Aug 31 03:02:17 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.shindig.social.opensocial.service;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -146,6 +146,7 @@
    *
    * @param urlTemplate The template the url follows
    */
+  @Override
   public void applyUrlTemplate(String urlTemplate) {
     this.putUrlParamsIntoParameters();
 
@@ -175,6 +176,7 @@
   }
 
 
+  @Override
   public <T> T getTypedParameter(String parameterName, Class<T> postDataClass) {
     // We assume the the only typed parameter in a restful request is the post-content
     // and so we simply ignore the parameter name
@@ -201,6 +203,7 @@
   /**
    * Return a single param value
    */
+  @Override
   public String getParameter(String paramName) {
     List<String> paramValue = this.params.get(paramName);
     if (paramValue != null && !paramValue.isEmpty()) {
@@ -209,6 +212,7 @@
     return null;
   }
 
+  @Override
   public String getParameter(String paramName, String defaultValue) {
     String result = getParameter(paramName);
     if (result == null) {
@@ -220,6 +224,7 @@
   /**
    * Return a list param value
    */
+  @Override
   public List<String> getListParameter(String paramName) {
     List<String> stringList = this.params.get(paramName);
     if (stringList == null) {

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/RpcRequestItem.java Sun Aug 31 03:02:17 2008
@@ -18,7 +18,7 @@
  */
 package org.apache.shindig.social.opensocial.service;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 
 import com.google.common.collect.Lists;
 
@@ -56,6 +56,7 @@
     }
   }
 
+  @Override
   public String getParameter(String paramName) {
     try {
       if (data.has(paramName)) {
@@ -68,6 +69,7 @@
     }
   }
 
+  @Override
   public String getParameter(String paramName, String defaultValue) {
     try {
       if (data.has(paramName)) {
@@ -80,6 +82,7 @@
     }
   }
 
+  @Override
   public List<String> getListParameter(String paramName) {
     try {
       if (data.has(paramName)) {
@@ -102,6 +105,7 @@
     }
   }
 
+  @Override
   public <T> T getTypedParameter(String parameterName, Class<T> dataTypeClass) {
     try {
       return converter.convertToObject(data.get(parameterName).toString(), dataTypeClass);
@@ -111,6 +115,7 @@
   }
 
 
+  @Override
   public void applyUrlTemplate(String urlTemplate) {
     // No params in the URL
   }

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityService.java Sun Aug 31 03:02:17 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.shindig.social.opensocial.spi;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.social.opensocial.model.Activity;
 import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
 

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AppDataService.java Sun Aug 31 03:02:17 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.shindig.social.opensocial.spi;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
 
 import com.google.inject.ImplementedBy;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java Sun Aug 31 03:02:17 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.shindig.social.opensocial.spi;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.social.opensocial.model.Person;
 import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
 

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java Sun Aug 31 03:02:17 2008
@@ -17,7 +17,7 @@
  */
 package org.apache.shindig.social.opensocial.spi;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 
 import org.apache.commons.lang.StringUtils;
 

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleContainerOAuthLookupService.java Sun Aug 31 03:02:17 2008
@@ -17,12 +17,13 @@
  */
 package org.apache.shindig.social.sample.oauth;
 
-import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.social.opensocial.oauth.OAuthLookupService;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.social.core.oauth.OAuthSecurityToken;
+import org.apache.shindig.social.opensocial.oauth.OAuthLookupService;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import net.oauth.OAuthAccessor;
 import net.oauth.OAuthConsumer;
 import net.oauth.OAuthException;

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java Sun Aug 31 03:02:17 2008
@@ -18,7 +18,7 @@
 
 package org.apache.shindig.social.sample.spi;
 
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.util.ImmediateFuture;
 import org.apache.shindig.common.util.ResourceLoader;
 import org.apache.shindig.social.ResponseError;
@@ -32,8 +32,8 @@
 import org.apache.shindig.social.opensocial.spi.GroupId;
 import org.apache.shindig.social.opensocial.spi.PersonService;
 import org.apache.shindig.social.opensocial.spi.RestfulCollection;
-import org.apache.shindig.social.opensocial.spi.UserId;
 import org.apache.shindig.social.opensocial.spi.SocialSpiException;
+import org.apache.shindig.social.opensocial.spi.UserId;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -41,6 +41,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
+
 import org.apache.commons.io.IOUtils;
 import org.json.JSONArray;
 import org.json.JSONException;

Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java?rev=690671&r1=690670&r2=690671&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialServiceTest.java Sun Aug 31 03:02:17 2008
@@ -18,17 +18,10 @@
  */
 package org.apache.shindig.social.sample.spi;
 
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-import junit.framework.TestCase;
-
-import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.auth.SecurityToken;
 import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.social.SocialApiTestsGuiceModule;
 import org.apache.shindig.social.ResponseError;
+import org.apache.shindig.social.SocialApiTestsGuiceModule;
 import org.apache.shindig.social.opensocial.model.Activity;
 import org.apache.shindig.social.opensocial.model.Person;
 import org.apache.shindig.social.opensocial.spi.CollectionOptions;
@@ -36,8 +29,15 @@
 import org.apache.shindig.social.opensocial.spi.GroupId;
 import org.apache.shindig.social.opensocial.spi.PersonService;
 import org.apache.shindig.social.opensocial.spi.RestfulCollection;
-import org.apache.shindig.social.opensocial.spi.UserId;
 import org.apache.shindig.social.opensocial.spi.SocialSpiException;
+import org.apache.shindig.social.opensocial.spi.UserId;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+import junit.framework.TestCase;
 
 import java.util.Collections;