You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by Vincent Siveton <vi...@gmail.com> on 2008/05/10 15:05:41 UTC
Re: svn commit: r655006 - in /incubator/shindig/trunk/java: ./ gadgets/src/main/java/org/apache/shindig/common/ gadgets/src/main/java/org/apache/shindig/gadgets/ gadgets/src/main/java/org/apache/shindig/gadgets/http/ gadgets/src/main/java/org/apache/
Hi,
Any reason why changing trunk/java/pom.xml mainly formatting, header
and xml namespaces?
If no, could you revert the part of this commit?
Cheers,
Vincent
2008/5/9, etnu@apache.org <et...@apache.org>:
> Author: etnu
> Date: Fri May 9 19:43:07 2008
> New Revision: 655006
>
> URL: http://svn.apache.org/viewvc?rev=655006&view=rev
> Log:
> Renamed GadgetToken (and related classes) to SecurityToken in the ongoing effort to migrate common code out of the gadgets artifact.
>
> Remaining tasks:
>
> - Throw a new exception type instead of GadgetException
> - Move from src/gadgets to src/common
>
>
> Added:
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityToken.java
> - copied, changed from r655004, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetToken.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java
> - copied, changed from r655004, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetTokenDecoder.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityToken.java
> - copied, changed from r655004, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetToken.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java
> - copied, changed from r655004, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetTokenDecoder.java
> Removed:
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetToken.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetTokenDecoder.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetToken.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetTokenDecoder.java
> Modified:
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContentFetcherFactory.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/GadgetRenderingTask.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpGadgetContext.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.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/test/java/org/apache/shindig/gadgets/FakeGadgetToken.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/HttpGadgetContextTest.java
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
> incubator/shindig/trunk/java/pom.xml
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/FriendsServiceAdapter.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PeopleServiceAdapter.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
> incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
>
> Copied: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityToken.java (from r655004, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetToken.java)
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityToken.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityToken.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetToken.java&r1=655004&r2=655006&rev=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetToken.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityToken.java Fri May 9 19:43:07 2008
> @@ -28,7 +28,7 @@
> /**
> * Primitive token implementation that uses stings as tokens.
> */
> -public class BasicGadgetToken implements GadgetToken {
> +public class BasicSecurityToken implements SecurityToken {
> /** serialized form of the token */
> private final String token;
>
> @@ -61,13 +61,13 @@
> * @param maxAge max age of the token (in seconds)
> * @throws BlobCrypterException
> */
> - public BasicGadgetToken(String token, int maxAge)
> + public BasicSecurityToken(String token, int maxAge)
> throws BlobCrypterException {
> this.token = token;
> this.tokenData = crypter.unwrap(token, maxAge);
> }
>
> - public BasicGadgetToken(String owner, String viewer, String app,
> + public BasicSecurityToken(String owner, String viewer, String app,
> String domain, String appUrl, String moduleId) throws BlobCrypterException {
> tokenData = new HashMap<String, String>(5,1);
> tokenData.put(OWNER_KEY, owner);
>
> Copied: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java (from r655004, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetTokenDecoder.java)
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetTokenDecoder.java&r1=655004&r2=655006&rev=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicGadgetTokenDecoder.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/BasicSecurityTokenDecoder.java Fri May 9 19:43:07 2008
> @@ -26,10 +26,10 @@
> import java.net.URLDecoder;
>
> /**
> - * A GadgetTokenDecoder implementation that just provides dummy data to satisfy
> + * A SecurityTokenDecoder implementation that just provides dummy data to satisfy
> * tests and API calls. Do not use this for any security applications.
> */
> -public class BasicGadgetTokenDecoder implements GadgetTokenDecoder {
> +public class BasicSecurityTokenDecoder implements SecurityTokenDecoder {
>
> private static final int OWNER_INDEX = 0;
> private static final int VIEWER_INDEX = 1;
> @@ -43,10 +43,10 @@
> *
> * Returns a token with some faked out values.
> */
> - public GadgetToken createToken(String stringToken) throws GadgetException {
> + public SecurityToken createToken(String stringToken) throws GadgetException {
> try {
> String[] tokens = stringToken.split(":");
> - return new BasicGadgetToken(
> + return new BasicSecurityToken(
> URLDecoder.decode(tokens[OWNER_INDEX], "UTF-8"),
> URLDecoder.decode(tokens[VIEWER_INDEX], "UTF-8"),
> URLDecoder.decode(tokens[APP_ID_INDEX], "UTF-8"),
> @@ -63,6 +63,6 @@
> /**
> * Creates a signer with 24 hour token expiry
> */
> - public BasicGadgetTokenDecoder() {
> + public BasicSecurityTokenDecoder() {
> }
> }
>
> Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/CommonGuiceModule.java Fri May 9 19:43:07 2008
> @@ -36,7 +36,7 @@
> // Once that happens then this common guice module can also move to
> // java/common.
> bind(ContentFetcher.class).to(BasicRemoteContentFetcher.class);
> - bind(GadgetTokenDecoder.class).to(BasicGadgetTokenDecoder.class);
> + bind(SecurityTokenDecoder.class).to(BasicSecurityTokenDecoder.class);
> bind(ContentCache.class).to(BasicContentCache.class);
> }
> }
>
> Copied: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityToken.java (from r655004, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetToken.java)
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityToken.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityToken.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetToken.java&r1=655004&r2=655006&rev=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetToken.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityToken.java Fri May 9 19:43:07 2008
> @@ -20,9 +20,9 @@
>
> /**
> * An abstract representation of a signing token.
> - * Use in conjunction with @code GadgetTokenDecoder.
> + * Use in conjunction with @code SecurityTokenDecoder.
> */
> -public interface GadgetToken {
> +public interface SecurityToken {
>
> /**
> * Serializes the token into a string. This can be the exact same as
>
> Copied: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java (from r655004, incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetTokenDecoder.java)
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java?p2=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetTokenDecoder.java&r1=655004&r2=655006&rev=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/GadgetTokenDecoder.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/common/SecurityTokenDecoder.java Fri May 9 19:43:07 2008
> @@ -23,7 +23,7 @@
> /**
> * Handles verification of gadget security tokens.
> */
> -public interface GadgetTokenDecoder {
> +public interface SecurityTokenDecoder {
>
> /**
> * Decrypts and verifies a gadget security token to return a gadget token.
> @@ -32,5 +32,5 @@
> * @return The token representation of the input data.
> * @throws GadgetException If tokenString is not a valid token
> */
> - public GadgetToken createToken(String tokenString) throws GadgetException;
> + public SecurityToken createToken(String tokenString) throws GadgetException;
> }
>
> Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContentFetcherFactory.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContentFetcherFactory.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContentFetcherFactory.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContentFetcherFactory.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.gadgets;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.gadgets.oauth.OAuthFetcherFactory;
> import org.apache.shindig.gadgets.oauth.OAuthRequestParams;
>
> @@ -47,7 +47,7 @@
> * @return A signing content fetcher
> * @throws GadgetException
> */
> - public ContentFetcher getSigningFetcher(GadgetToken token)
> + public ContentFetcher getSigningFetcher(SecurityToken token)
> throws GadgetException {
> return signingFetcherFactory.getSigningFetcher(
> remoteContentFetcherFactory.get(), token);
> @@ -60,7 +60,7 @@
> * @throws GadgetException
> */
> public ContentFetcher getOAuthFetcher(
> - GadgetToken token,
> + SecurityToken token,
> OAuthRequestParams params)
> throws GadgetException {
> return oauthFetcherFactory.getOAuthFetcher(
>
> 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=655006&r1=655005&r2=655006&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 Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.gadgets;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.gadgets.spec.GadgetSpec;
>
> import java.net.URI;
> @@ -95,7 +95,7 @@
> * @return The token associated with this request
> */
> @SuppressWarnings("unused")
> - public GadgetToken getToken() throws GadgetException {
> + public SecurityToken getToken() throws GadgetException {
> return null;
> }
> }
>
> 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=655006&r1=655005&r2=655006&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 Fri May 9 19:43:07 2008
> @@ -14,7 +14,7 @@
>
> package org.apache.shindig.gadgets;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.util.Crypto;
> import org.apache.shindig.util.TimeSource;
>
> @@ -64,7 +64,7 @@
> /**
> * Authentication token for the user and gadget making the request.
> */
> - protected final GadgetToken authToken;
> + protected final SecurityToken authToken;
>
> /**
> * Private key we pass to the OAuth RSA_SHA1 algorithm. This can be a
> @@ -88,7 +88,7 @@
> * keys.
> */
> protected SigningFetcher(ContentCache cache,
> - ContentFetcher next, GadgetToken authToken) {
> + ContentFetcher next, SecurityToken authToken) {
> this(cache, next, authToken, null, null);
> }
>
> @@ -100,7 +100,7 @@
> * @param privateKey the key to use for the signing
> */
> public static SigningFetcher makeFromPrivateKey(ContentCache cache,
> - ContentFetcher next, GadgetToken authToken,
> + ContentFetcher next, SecurityToken authToken,
> String keyName, PrivateKey privateKey) {
> return new SigningFetcher(cache, next, authToken, keyName, privateKey);
> }
> @@ -114,7 +114,7 @@
> */
> public static SigningFetcher makeFromB64PrivateKey(ContentCache cache,
> ContentFetcher next,
> - GadgetToken authToken, String keyName, String privateKey) {
> + SecurityToken authToken, String keyName, String privateKey) {
> return new SigningFetcher(cache, next, authToken, keyName, privateKey);
> }
>
> @@ -127,13 +127,13 @@
> */
> public static SigningFetcher makeFromPrivateKeyBytes(
> ContentCache cache, ContentFetcher next,
> - GadgetToken authToken, String keyName,
> + SecurityToken authToken, String keyName,
> byte[] privateKey) {
> return new SigningFetcher(cache, next, authToken, keyName, privateKey);
> }
>
> protected SigningFetcher(ContentCache cache, ContentFetcher next,
> - GadgetToken authToken, String keyName, Object privateKeyObject) {
> + SecurityToken authToken, String keyName, Object privateKeyObject) {
> super(next);
> this.cache = cache;
> this.authToken = authToken;
>
> 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=655006&r1=655005&r2=655006&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 Fri May 9 19:43:07 2008
> @@ -18,7 +18,7 @@
> */
> package org.apache.shindig.gadgets;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.util.InputStreamConsumer;
> import org.apache.shindig.util.ResourceLoader;
>
> @@ -46,7 +46,7 @@
> */
> @SuppressWarnings("unused")
> public ContentFetcher getSigningFetcher(
> - ContentFetcher networkFetcher, GadgetToken token)
> + ContentFetcher networkFetcher, SecurityToken token)
> throws GadgetException {
> return SigningFetcher.makeFromB64PrivateKey(cache,
> networkFetcher, token, keyName, privateKey);
>
> Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingTask.java Fri May 9 19:43:07 2008
> @@ -19,7 +19,7 @@
>
> package org.apache.shindig.gadgets.http;
>
> -import org.apache.shindig.common.GadgetTokenDecoder;
> +import org.apache.shindig.common.SecurityTokenDecoder;
> import org.apache.shindig.gadgets.ContainerConfig;
> import org.apache.shindig.gadgets.Gadget;
> import org.apache.shindig.gadgets.GadgetContentFilter;
> @@ -76,7 +76,7 @@
> private final GadgetFeatureRegistry registry;
> private final ContainerConfig containerConfig;
> private final UrlGenerator urlGenerator;
> - private final GadgetTokenDecoder tokenDecoder;
> + private final SecurityTokenDecoder tokenDecoder;
> private GadgetContext context;
> private final List<GadgetContentFilter> filters;
> private final LockedDomainService domainLocker;
> @@ -522,7 +522,7 @@
> GadgetFeatureRegistry registry,
> ContainerConfig containerConfig,
> UrlGenerator urlGenerator,
> - GadgetTokenDecoder tokenDecoder,
> + SecurityTokenDecoder tokenDecoder,
> LockedDomainService lockedDomainService) {
>
> this.server = server;
>
> Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpGadgetContext.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpGadgetContext.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpGadgetContext.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpGadgetContext.java Fri May 9 19:43:07 2008
> @@ -19,8 +19,8 @@
>
> package org.apache.shindig.gadgets.http;
>
> -import org.apache.shindig.common.GadgetToken;
> -import org.apache.shindig.common.GadgetTokenDecoder;
> +import org.apache.shindig.common.SecurityToken;
> +import org.apache.shindig.common.SecurityTokenDecoder;
> import org.apache.shindig.gadgets.GadgetContext;
> import org.apache.shindig.gadgets.GadgetException;
> import org.apache.shindig.gadgets.RenderingContext;
> @@ -254,9 +254,9 @@
> }
>
> private final String tokenString;
> - private final GadgetTokenDecoder tokenDecoder;
> + private final SecurityTokenDecoder tokenDecoder;
> @Override
> - public GadgetToken getToken() throws GadgetException {
> + public SecurityToken getToken() throws GadgetException {
> if (tokenString == null || tokenString.length() == 0) {
> return super.getToken();
> } else {
> @@ -265,7 +265,7 @@
> }
>
> public HttpGadgetContext(HttpServletRequest request,
> - GadgetTokenDecoder tokenDecoder) {
> + SecurityTokenDecoder tokenDecoder) {
> url = getUrl(request);
> moduleId = getModuleId(request);
> locale = getLocale(request);
>
> Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.gadgets.http;
>
> -import org.apache.shindig.common.GadgetTokenDecoder;
> +import org.apache.shindig.common.SecurityTokenDecoder;
> import org.apache.shindig.gadgets.GadgetContext;
> import org.apache.shindig.gadgets.GadgetFeature;
> import org.apache.shindig.gadgets.GadgetFeatureFactory;
> @@ -46,9 +46,9 @@
> this.registry = registry;
> }
>
> - private GadgetTokenDecoder tokenDecoder;
> + private SecurityTokenDecoder tokenDecoder;
> @Inject
> - public void setRegistry(GadgetTokenDecoder tokenDecoder) {
> + public void setRegistry(SecurityTokenDecoder tokenDecoder) {
> this.tokenDecoder = tokenDecoder;
> }
>
>
> Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java Fri May 9 19:43:07 2008
> @@ -18,8 +18,8 @@
> */
> package org.apache.shindig.gadgets.http;
>
> -import org.apache.shindig.common.GadgetToken;
> -import org.apache.shindig.common.GadgetTokenDecoder;
> +import org.apache.shindig.common.SecurityToken;
> +import org.apache.shindig.common.SecurityTokenDecoder;
> import org.apache.shindig.gadgets.ContentFetcher;
> import org.apache.shindig.gadgets.ContentFetcherFactory;
> import org.apache.shindig.gadgets.GadgetException;
> @@ -69,7 +69,7 @@
> Logger.getLogger(ProxyHandler.class.getPackage().getName());
>
>
> - private final GadgetTokenDecoder gadgetTokenDecoder;
> + private final SecurityTokenDecoder securityTokenDecoder;
>
> private final static Set<String> DISALLOWED_RESPONSE_HEADERS
> = new HashSet<String>();
> @@ -95,10 +95,10 @@
>
> @Inject
> public ProxyHandler(ContentFetcherFactory contentFetcherFactory,
> - GadgetTokenDecoder gadgetTokenDecoder,
> + SecurityTokenDecoder securityTokenDecoder,
> LockedDomainService lockedDomainService) {
> this.contentFetcherFactory = contentFetcherFactory;
> - this.gadgetTokenDecoder = gadgetTokenDecoder;
> + this.securityTokenDecoder = securityTokenDecoder;
> this.domainLocker = lockedDomainService;
> }
>
> @@ -379,10 +379,10 @@
> * @return A valid token for the given input.
> * @throws GadgetException
> */
> - private GadgetToken extractAndValidateToken(HttpServletRequest request)
> + private SecurityToken extractAndValidateToken(HttpServletRequest request)
> throws GadgetException {
> String token = getParameter(request, SECURITY_TOKEN_PARAM, "");
> - return gadgetTokenDecoder.createToken(token);
> + return securityTokenDecoder.createToken(token);
> }
>
> /**
>
> 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=655006&r1=655005&r2=655006&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 Fri May 9 19:43:07 2008
> @@ -16,7 +16,7 @@
> */
> package org.apache.shindig.gadgets.oauth;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.gadgets.ChainedContentFetcher;
> import org.apache.shindig.gadgets.ContentFetcher;
> import org.apache.shindig.gadgets.GadgetException;
> @@ -71,7 +71,7 @@
> /**
> * The gadget security token, with info about owner/viewer/gadget.
> */
> - protected final GadgetToken authToken;
> + protected final SecurityToken authToken;
>
> /**
> * The gadget's nickname for the service provider.
> @@ -133,7 +133,7 @@
> GadgetOAuthTokenStore tokenStore,
> BlobCrypter oauthCrypter,
> ContentFetcher nextFetcher,
> - GadgetToken authToken,
> + SecurityToken authToken,
> OAuthRequestParams params) {
> super(nextFetcher);
> this.oauthCrypter = oauthCrypter;
>
> 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=655006&r1=655005&r2=655006&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 Fri May 9 19:43:07 2008
> @@ -18,7 +18,7 @@
> */
> package org.apache.shindig.gadgets.oauth;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.gadgets.ContentFetcher;
> import org.apache.shindig.gadgets.GadgetException;
> import org.apache.shindig.util.BasicBlobCrypter;
> @@ -95,7 +95,7 @@
> */
> public OAuthFetcher getOAuthFetcher(
> ContentFetcher nextFetcher,
> - GadgetToken token,
> + SecurityToken token,
> OAuthRequestParams params) throws GadgetException {
> OAuthFetcher fetcher = new OAuthFetcher(
> tokenStore, oauthCrypter, nextFetcher, token, params);
>
> Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetToken.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetToken.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetToken.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetToken.java Fri May 9 19:43:07 2008
> @@ -18,12 +18,12 @@
> */
> package org.apache.shindig.gadgets;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
>
> /**
> - * A fake GadgetToken implementation to help testing.
> + * A fake SecurityToken implementation to help testing.
> */
> -public class FakeGadgetToken implements GadgetToken {
> +public class FakeGadgetToken implements SecurityToken {
> public String getOwnerId() {
> return "owner";
> }
>
> 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=655006&r1=655005&r2=655006&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 Fri May 9 19:43:07 2008
> @@ -17,8 +17,8 @@
> */
> package org.apache.shindig.gadgets;
>
> -import org.apache.shindig.common.BasicGadgetToken;
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.BasicSecurityToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.gadgets.spec.GadgetSpec;
> import org.apache.shindig.util.BlobCrypterException;
> import static org.easymock.EasyMock.eq;
> @@ -44,9 +44,9 @@
>
> @Override
> @SuppressWarnings("unused")
> - public GadgetToken getToken() throws GadgetException {
> + public SecurityToken getToken() throws GadgetException {
> try {
> - return new BasicGadgetToken("o", "v", "a", "d", "u", "m");
> + return new BasicSecurityToken("o", "v", "a", "d", "u", "m");
> } catch (BlobCrypterException bce) {
> throw new RuntimeException(bce);
> }
>
> 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=655006&r1=655005&r2=655006&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 Fri May 9 19:43:07 2008
> @@ -19,7 +19,7 @@
>
> package org.apache.shindig.gadgets;
>
> -import org.apache.shindig.common.GadgetTokenDecoder;
> +import org.apache.shindig.common.SecurityTokenDecoder;
>
> import java.util.concurrent.Executor;
>
> @@ -29,8 +29,8 @@
> public abstract class GadgetTestFixture extends EasyMockTestCase {
> public final HttpServletRequest request = mock(HttpServletRequest.class);
> public final HttpServletResponse response = mock(HttpServletResponse.class);
> - public final GadgetTokenDecoder gadgetTokenDecoder
> - = mock(GadgetTokenDecoder.class);
> + public final SecurityTokenDecoder securityTokenDecoder
> + = mock(SecurityTokenDecoder.class);
> public final GadgetServer gadgetServer;
> public final ContentFetcherFactory fetcherFactory
> = mock(ContentFetcherFactory.class);
>
> 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=655006&r1=655005&r2=655006&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 Fri May 9 19:43:07 2008
> @@ -16,7 +16,7 @@
>
> import junit.framework.TestCase;
>
> -import org.apache.shindig.common.BasicGadgetToken;
> +import org.apache.shindig.common.BasicSecurityToken;
>
> import net.oauth.OAuth;
> import net.oauth.OAuth.Parameter;
> @@ -69,7 +69,7 @@
> private InterceptingContentFetcher interceptor;
> private ContentCache cache;
> private SigningFetcher signer;
> - private BasicGadgetToken authToken;
> + private BasicSecurityToken authToken;
> private OAuthAccessor accessor;
> private OAuthValidator messageValidator;
>
> @@ -78,7 +78,7 @@
> super.setUp();
> cache = new BasicContentCache();
> interceptor = new InterceptingContentFetcher();
> - authToken = new BasicGadgetToken("o", "v", "a", "d", "u", "m");
> + authToken = new BasicSecurityToken("o", "v", "a", "d", "u", "m");
> signer = SigningFetcher.makeFromB64PrivateKey(cache,
> interceptor, authToken, "foo", PRIVATE_KEY_TEXT);
> OAuthConsumer consumer = new OAuthConsumer(null, null, null, null);
>
> Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpGadgetContextTest.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpGadgetContextTest.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpGadgetContextTest.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpGadgetContextTest.java Fri May 9 19:43:07 2008
> @@ -29,7 +29,7 @@
> expect(request.getParameter("nocache")).andReturn(
> Integer.toString(Integer.MAX_VALUE));
> replay();
> - GadgetContext context = new HttpGadgetContext(request, gadgetTokenDecoder);
> + GadgetContext context = new HttpGadgetContext(request, securityTokenDecoder);
> verify();
> assertEquals(true, context.getIgnoreCache());
> }
> @@ -39,7 +39,7 @@
> expect(request.getParameter("country")).andReturn(
> Locale.CHINA.getCountry());
> replay();
> - GadgetContext context = new HttpGadgetContext(request, gadgetTokenDecoder);
> + GadgetContext context = new HttpGadgetContext(request, securityTokenDecoder);
> verify();
> assertEquals(Locale.CHINA, context.getLocale());
> }
> @@ -47,7 +47,7 @@
> public void testDebug() {
> expect(request.getParameter("debug")).andReturn("1");
> replay();
> - GadgetContext context = new HttpGadgetContext(request, gadgetTokenDecoder);
> + GadgetContext context = new HttpGadgetContext(request, securityTokenDecoder);
> verify();
> assertEquals(true, context.getDebug());
> }
>
> Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java Fri May 9 19:43:07 2008
> @@ -37,10 +37,10 @@
> super();
> proxyHandler = new ProxyHandler(
> contentFetcherFactory,
> - gadgetTokenDecoder,
> + securityTokenDecoder,
> lockedDomainService);
> gadgetRenderer = new GadgetRenderingTask(gadgetServer, registry,
> - containerConfig, urlGenerator, gadgetTokenDecoder, lockedDomainService);
> + containerConfig, urlGenerator, securityTokenDecoder, lockedDomainService);
> jsonRpcHandler = new JsonRpcHandler(executor, gadgetServer, urlGenerator);
> }
> }
>
> Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java (original)
> +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java Fri May 9 19:43:07 2008
> @@ -19,7 +19,7 @@
>
> package org.apache.shindig.gadgets.http;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.gadgets.FakeGadgetToken;
> import org.apache.shindig.gadgets.GadgetException;
> import org.apache.shindig.gadgets.RemoteContent;
> @@ -45,7 +45,7 @@
> private final static String URL_ONE = "http://www.example.com/test.html";
> private final static String DATA_ONE = "hello world";
>
> - private static final GadgetToken DUMMY_TOKEN = new FakeGadgetToken();
> + private static final SecurityToken DUMMY_TOKEN = new FakeGadgetToken();
>
> final ByteArrayOutputStream baos = new ByteArrayOutputStream();
> final PrintWriter writer = new PrintWriter(baos);
> @@ -207,7 +207,7 @@
> // Doesn't actually sign since it returns the standard fetcher.
> // Signing tests are in SigningFetcherTest
> setupGetRequestMock(URL_ONE);
> - expect(gadgetTokenDecoder.createToken("fake-token")).andReturn(DUMMY_TOKEN);
> + expect(securityTokenDecoder.createToken("fake-token")).andReturn(DUMMY_TOKEN);
> expect(request.getParameter(ProxyHandler.SECURITY_TOKEN_PARAM))
> .andReturn("fake-token").atLeastOnce();
> expect(request.getParameter(Preload.AUTHZ_ATTR))
> @@ -227,7 +227,7 @@
> // Signing tests are in SigningFetcherTest
> String postBody = "foo=bar%20baz";
> setupPostRequestMock(URL_ONE, postBody);
> - expect(gadgetTokenDecoder.createToken("fake-token")).andReturn(DUMMY_TOKEN);
> + expect(securityTokenDecoder.createToken("fake-token")).andReturn(DUMMY_TOKEN);
> expect(request.getParameter(ProxyHandler.SECURITY_TOKEN_PARAM))
> .andReturn("fake-token").atLeastOnce();
> expect(request.getParameter(Preload.AUTHZ_ATTR))
>
> 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=655006&r1=655005&r2=655006&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 Fri May 9 19:43:07 2008
> @@ -21,8 +21,8 @@
>
> import net.oauth.OAuthServiceProvider;
>
> -import org.apache.shindig.common.BasicGadgetToken;
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.BasicSecurityToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.gadgets.ContentFetcher;
> import org.apache.shindig.gadgets.GadgetException;
> import org.apache.shindig.gadgets.RemoteContent;
> @@ -90,9 +90,9 @@
> /**
> * Builds a nicely populated gadget token.
> */
> - public static GadgetToken getGadgetToken(String owner, String viewer)
> + public static SecurityToken getSecurityToken(String owner, String viewer)
> throws Exception {
> - return new BasicGadgetToken(owner, viewer, "app", "container.com",
> + return new BasicSecurityToken(owner, viewer, "app", "container.com",
> GADGET_URL, "0");
> }
>
> @@ -102,7 +102,7 @@
> }
>
> public ContentFetcher getFetcher(
> - GadgetToken authToken, OAuthRequestParams params) throws GadgetException {
> + SecurityToken authToken, OAuthRequestParams params) throws GadgetException {
> OAuthFetcher fetcher = new OAuthFetcher(
> tokenStore, blobCrypter, serviceProvider, authToken, params);
> fetcher.init();
> @@ -116,7 +116,7 @@
> RemoteContent response;
>
> fetcher = getFetcher(
> - getGadgetToken("owner", "owner"),
> + getSecurityToken("owner", "owner"),
> new OAuthRequestParams(SERVICE_NAME, null, null));
> request = new RemoteContentRequest(
> new URI(FakeOAuthServiceProvider.RESOURCE_URL));
> @@ -129,7 +129,7 @@
> serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
>
> fetcher = getFetcher(
> - getGadgetToken("owner", "owner"),
> + getSecurityToken("owner", "owner"),
> new OAuthRequestParams(SERVICE_NAME, null, clientState));
> request = new RemoteContentRequest(
> new URI(FakeOAuthServiceProvider.RESOURCE_URL));
> @@ -137,7 +137,7 @@
> assertEquals("User data is hello-oauth", response.getResponseAsString());
>
> fetcher = getFetcher(
> - getGadgetToken("owner", "somebody else"),
> + getSecurityToken("owner", "somebody else"),
> new OAuthRequestParams(SERVICE_NAME, null, null));
> request = new RemoteContentRequest(
> new URI(FakeOAuthServiceProvider.RESOURCE_URL));
> @@ -145,7 +145,7 @@
> assertEquals("User data is hello-oauth", response.getResponseAsString());
>
> fetcher = getFetcher(
> - getGadgetToken("somebody else", "somebody else"),
> + getSecurityToken("somebody else", "somebody else"),
> new OAuthRequestParams(SERVICE_NAME, null, null));
> request = new RemoteContentRequest(
> new URI(FakeOAuthServiceProvider.RESOURCE_URL));
> @@ -158,7 +158,7 @@
> serviceProvider.browserVisit(approvalUrl + "&user_data=somebody%20else");
>
> fetcher = getFetcher(
> - getGadgetToken("somebody else", "somebody else"),
> + getSecurityToken("somebody else", "somebody else"),
> new OAuthRequestParams(SERVICE_NAME, null, clientState));
> request = new RemoteContentRequest(
> new URI(FakeOAuthServiceProvider.RESOURCE_URL));
>
> Modified: incubator/shindig/trunk/java/pom.xml
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/pom.xml?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/pom.xml (original)
> +++ incubator/shindig/trunk/java/pom.xml Fri May 9 19:43:07 2008
> @@ -1,47 +1,30 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<!--
> -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.
> --->
> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
> - <modelVersion>4.0.0</modelVersion>
> -
> +<?xml version="1.0" encoding="UTF-8"?><project>
> <parent>
> - <groupId>org.apache.shindig</groupId>
> <artifactId>shindig-project</artifactId>
> + <groupId>org.apache.shindig</groupId>
> <version>1-SNAPSHOT</version>
> </parent>
> -
> + <modelVersion>4.0.0</modelVersion>
> <artifactId>shindig-parent</artifactId>
> <packaging>pom</packaging>
> -
> <name>Apache Shindig Project Parent</name>
> <description>Parent POM defining settings that can be used across Java impl</description>
> -
> + <scm>
> + <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/java</connection>
> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java</developerConnection>
> + <url>http://svn.apache.org/viewvc/incubator/shindig/trunk/java</url>
> + </scm>
> <modules>
> <module>common</module>
> <module>gadgets</module>
> <module>social-api</module>
> <module>server</module>
> </modules>
> -
> - <scm>
> - <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/trunk/java</connection>
> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/trunk/java</developerConnection>
> - <url>http://svn.apache.org/viewvc/incubator/shindig/trunk/java</url>
> - </scm>
> -</project>
> + <dependencies>
> + <dependency>
> + <groupId>com.google.code.guice</groupId>
> + <artifactId>guice</artifactId>
> + <version>1.0</version>
> + </dependency>
> + </dependencies>
> +</project>
> \ No newline at end of file
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java Fri May 9 19:43:07 2008
> @@ -17,8 +17,8 @@
> */
> package org.apache.shindig.social;
>
> -import org.apache.shindig.common.GadgetToken;
> -import org.apache.shindig.common.GadgetTokenDecoder;
> +import org.apache.shindig.common.SecurityToken;
> +import org.apache.shindig.common.SecurityTokenDecoder;
> import org.apache.shindig.gadgets.GadgetException;
> import org.apache.shindig.gadgets.http.InjectedServlet;
> import org.apache.shindig.social.opensocial.util.BeanJsonConverter;
> @@ -59,7 +59,7 @@
> = Logger.getLogger("org.apache.shindig.social");
>
> private List<GadgetDataHandler> handlers;
> - private GadgetTokenDecoder gadgetTokenDecoder;
> + private SecurityTokenDecoder securityTokenDecoder;
> private BeanJsonConverter beanJsonConverter;
>
> @Inject
> @@ -68,8 +68,8 @@
> }
>
> @Inject
> - public void setGadgetTokenDecoder(GadgetTokenDecoder gadgetTokenDecoder) {
> - this.gadgetTokenDecoder = gadgetTokenDecoder;
> + public void setSecurityTokenDecoder(SecurityTokenDecoder securityTokenDecoder) {
> + this.securityTokenDecoder = securityTokenDecoder;
> }
>
> @Inject
> @@ -105,7 +105,7 @@
> if (token == null || token.trim().length() == 0) {
> throw new GadgetException(GadgetException.Code.INVALID_GADGET_TOKEN);
> }
> - GadgetToken securityToken = gadgetTokenDecoder.createToken(token);
> + SecurityToken securityToken = securityTokenDecoder.createToken(token);
>
> // TODO: Improve json input handling. The json request should get auto
> // translated into objects
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.social;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
>
> import org.json.JSONObject;
>
> @@ -28,9 +28,9 @@
> public class RequestItem {
> private String type;
> private JSONObject params;
> - private GadgetToken token;
> + private SecurityToken token;
>
> - public RequestItem(String type, JSONObject params, GadgetToken token) {
> + public RequestItem(String type, JSONObject params, SecurityToken token) {
> this.type = type;
> this.params = params;
> this.token = token;
> @@ -52,11 +52,11 @@
> this.params = params;
> }
>
> - public GadgetToken getToken() {
> + public SecurityToken getToken() {
> return token;
> }
>
> - public void setToken(GadgetToken token) {
> + public void setToken(SecurityToken token) {
> this.token = token;
> }
> }
> \ No newline at end of file
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/ActivitiesServiceAdapter.java Fri May 9 19:43:07 2008
> @@ -65,7 +65,7 @@
> }
>
> List<Activity> listOfObj = activitiesService.getActivities(ids,
> - getGadgetToken(request, uid)).getResponse();
> + getSecurityToken(request, uid)).getResponse();
> return returnFeed(request, TITLE, AUTHOR, (List)listOfObj);
> }
>
> @@ -78,7 +78,7 @@
> String aid = request.getTarget().getParameter("aid");
>
> Activity obj = activitiesService.getActivity(uid, aid,
> - getGadgetToken(request, uid)).getResponse();
> + getSecurityToken(request, uid)).getResponse();
>
> // TODO: how is entry id determined. check.
> String entryId = request.getUri().toString();
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/DataServiceAdapter.java Fri May 9 19:43:07 2008
> @@ -57,7 +57,7 @@
> List<String> ids = getFriendIds(request, uid);
>
> Map<String, Map<String, String>> dataMap = dataService.getPersonData(ids,
> - getKeys(request), getGadgetToken(request, uid)).getResponse();
> + getKeys(request), getSecurityToken(request, uid)).getResponse();
>
> // TODO: This return type is not quite right. We should fix this to
> // match the spec once we have a full json format in place.
> @@ -79,7 +79,7 @@
> ids.add(uid);
>
> Map<String, String> data = dataService.getPersonData(ids,
> - getKeys(request), getGadgetToken(request, uid)).getResponse().get(uid);
> + getKeys(request), getSecurityToken(request, uid)).getResponse().get(uid);
>
> // TODO: how is entry id determined. check.
> String entryId = request.getUri().toString();
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/FriendsServiceAdapter.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/FriendsServiceAdapter.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/FriendsServiceAdapter.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/FriendsServiceAdapter.java Fri May 9 19:43:07 2008
> @@ -86,7 +86,7 @@
> // TODO: Should have a real concept of first, max sort etc with defaults
> return peopleService.getPeople(getFriendIds(request, uid),
> PeopleService.SortOrder.name, null, 0, 100, null,
> - getGadgetToken(request, uid));
> + getSecurityToken(request, uid));
> }
>
> }
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PeopleServiceAdapter.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PeopleServiceAdapter.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PeopleServiceAdapter.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/PeopleServiceAdapter.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.social.abdera;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.social.opensocial.model.Person;
>
> import org.apache.abdera.protocol.server.RequestContext;
> @@ -48,7 +48,7 @@
> */
> public ResponseContext getEntry(RequestContext request) {
> String uid = request.getTarget().getParameter("uid");
> - GadgetToken token = getGadgetToken(request, uid);
> + SecurityToken token = getSecurityToken(request, uid);
> Person person = peopleService.getPerson(uid, token).getResponse();
>
> // TODO: how is entry id determined. check.
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.social.abdera;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.social.opensocial.PeopleService;
> import org.apache.shindig.social.opensocial.model.Activity;
> import org.apache.shindig.social.opensocial.model.IdSpec;
> @@ -200,10 +200,10 @@
> }
> }
>
> - protected GadgetToken getGadgetToken(RequestContext request,
> + protected SecurityToken getSecurityToken(RequestContext request,
> final String viewerId) {
> // TODO: Replace this with the real thing
> - return new GadgetToken() {
> + return new SecurityToken() {
> public String toSerialForm() {
> return "";
> }
> @@ -235,7 +235,7 @@
> }
>
> protected List<String> getFriendIds(RequestContext request, String uid) {
> - GadgetToken token = getGadgetToken(request, uid);
> + SecurityToken token = getSecurityToken(request, uid);
> IdSpec idSpec = new IdSpec(null, IdSpec.Type.VIEWER_FRIENDS);
> try {
> return peopleService.getIds(idSpec, token);
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/ActivitiesService.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.social.opensocial;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.social.ResponseItem;
> import org.apache.shindig.social.opensocial.model.Activity;
>
> @@ -27,22 +27,22 @@
> /**
> * Returns a list of activities that correspond to the passed in person ids.
> * @param ids The ids of the people to fetch activities for.
> - * @param token A valid GadgetToken
> + * @param token A valid SecurityToken
> * @return a response item with the list of activities.
> */
> public ResponseItem<List<Activity>> getActivities(List<String> ids,
> - GadgetToken token);
> + SecurityToken token);
>
> /**
> * Creates the passed in activity for the given user. Once createActivity is
> * called, getActivities will be able to return the Activity.
> * @param personId The id of the person to create the activity for.
> * @param activity The activity to create.
> - * @param token A valid GadgetToken
> + * @param token A valid SecurityToken
> * @return a response item containing any errors
> */
> public ResponseItem createActivity(String personId, Activity activity,
> - GadgetToken token);
> + SecurityToken token);
>
> /**
> * Returns an activity for the gived user id that matches the passes in
> @@ -50,9 +50,9 @@
> *
> * @param id The id of the user to activity belongs to
> * @param activityId The id of the activity
> - * @param token A valid GadgetToken
> + * @param token A valid SecurityToken
> * @return a reponse item with the matching activity
> */
> public ResponseItem<Activity> getActivity(String id, String activityId,
> - GadgetToken token);
> + SecurityToken token);
> }
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/DataService.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.social.opensocial;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.social.ResponseItem;
>
> import java.util.List;
> @@ -29,12 +29,12 @@
> * Fetch data for a list of ids.
> * @param ids The list of ids
> * @param keys The list of keys to fetch
> - * @param token The GadgetToken for this request
> + * @param token The SecurityToken for this request
> * @return ResponseItem a response item with the error code set if
> * there was a problem
> */
> public ResponseItem<Map<String, Map<String, String>>> getPersonData(
> - List<String> ids, List<String> keys, GadgetToken token);
> + List<String> ids, List<String> keys, SecurityToken token);
>
> /**
> * Updates the data key for the given person with the new value.
> @@ -42,10 +42,10 @@
> * @param id The person the data is for.
> * @param key The key of the data.
> * @param value The new value of the data.
> - * @param token The GadgetToken for this request
> + * @param token The SecurityToken for this request
> * @return ResponseItem a response item with the error code set if
> * there was a problem
> */
> public ResponseItem updatePersonData(String id, String key,
> - String value, GadgetToken token);
> + String value, SecurityToken token);
> }
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/PeopleService.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.social.opensocial;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.social.ResponseItem;
> import org.apache.shindig.social.opensocial.model.ApiCollection;
> import org.apache.shindig.social.opensocial.model.IdSpec;
> @@ -38,7 +38,7 @@
> * @return a list of person ids
> * @throws JSONException If the idSpec is malformed
> */
> - public List<String> getIds(IdSpec idSpec, GadgetToken token)
> + public List<String> getIds(IdSpec idSpec, SecurityToken token)
> throws JSONException;
>
> public enum SortOrder {
> @@ -62,7 +62,7 @@
> */
> public ResponseItem<ApiCollection<Person>> getPeople(List<String> ids,
> SortOrder sortOrder, FilterType filter, int first, int max,
> - Set<String> profileDetails, GadgetToken token);
> + Set<String> profileDetails, SecurityToken token);
>
> /**
> * Returns a person that corresponds to the passed in person id.
> @@ -71,5 +71,5 @@
> * @param token The gadget token
> * @return a list of people.
> */
> - public ResponseItem<Person> getPerson(String id, GadgetToken token);
> + public ResponseItem<Person> getPerson(String id, SecurityToken token);
> }
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicActivitiesService.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.social.samplecontainer;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.social.ResponseError;
> import org.apache.shindig.social.ResponseItem;
> import org.apache.shindig.social.opensocial.ActivitiesService;
> @@ -41,7 +41,7 @@
> }
>
> public ResponseItem<List<Activity>> getActivities(List<String> ids,
> - GadgetToken token) {
> + SecurityToken token) {
> Map<String, List<Activity>> allActivities = fetcher.getActivities();
>
> List<Activity> activities = new ArrayList<Activity>();
> @@ -58,7 +58,7 @@
> }
>
> public ResponseItem<Activity> getActivity(String id, String activityId,
> - GadgetToken token) {
> + SecurityToken token) {
> List<String> ids = new ArrayList<String>();
> ids.add(id);
>
> @@ -73,7 +73,7 @@
> }
>
> public ResponseItem createActivity(String personId, Activity activity,
> - GadgetToken token) {
> + SecurityToken token) {
> // TODO: Validate the activity and do any template expanding
> activity.setUserId(personId);
> activity.setPostedTime(new Date().getTime());
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicDataService.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.social.samplecontainer;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.social.ResponseError;
> import org.apache.shindig.social.ResponseItem;
> import org.apache.shindig.social.opensocial.DataService;
> @@ -40,7 +40,7 @@
> }
>
> public ResponseItem<Map<String, Map<String, String>>> getPersonData(
> - List<String> ids, List<String> keys, GadgetToken token) {
> + List<String> ids, List<String> keys, SecurityToken token) {
>
> Map<String, Map<String, String>> allData = fetcher.getAppData();
>
> @@ -66,7 +66,7 @@
> }
>
> public ResponseItem updatePersonData(String id, String key, String value,
> - GadgetToken token) {
> + SecurityToken token) {
> if (!isValidKey(key)) {
> return new ResponseItem<Object>(ResponseError.BAD_REQUEST,
> "The person data key had invalid characters",
>
> Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java
> URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java?rev=655006&r1=655005&r2=655006&view=diff
> ==============================================================================
> --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java (original)
> +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/samplecontainer/BasicPeopleService.java Fri May 9 19:43:07 2008
> @@ -17,7 +17,7 @@
> */
> package org.apache.shindig.social.samplecontainer;
>
> -import org.apache.shindig.common.GadgetToken;
> +import org.apache.shindig.common.SecurityToken;
> import org.apache.shindig.social.ResponseItem;
> import org.apache.shindig.social.opensocial.PeopleService;
> import org.apache.shindig.social.opensocial.model.ApiCollection;
> @@ -52,7 +52,7 @@
> this.fetcher = fetcher;
> }
>
> - private List<Person> getPeople(List<String> ids, GadgetToken token) {
> + private List<Person> getPeople(List<String> ids, SecurityToken token) {
> Map<String, Person> allPeople = fetcher.getAllPeople();
>
> List<Person> people = new ArrayList<Person>();
> @@ -73,7 +73,7 @@
>
> public ResponseItem<ApiCollection<Person>> getPeople(List<String> ids,
> SortOrder sortOrder, FilterType filter, int first, int max,
> - Set<String> profileDetails, GadgetToken token) {
> + Set<String> profileDetails, SecurityToken token) {
> List<Person> people = getPeople(ids, token);
>
> // We can pretend that by default the people are in top friends order
> @@ -93,13 +93,13 @@
> return new ResponseItem<ApiCollection<Person>>(collection);
> }
>
> - public ResponseItem<Person> getPerson(String id, GadgetToken token) {
> + public ResponseItem<Person> getPerson(String id, SecurityToken token) {
> List<String> ids = new ArrayList<String>();
> ids.add(id);
> return new ResponseItem<Person>(getPeople(ids, token).get(0));
> }
>
> - public List<String> getIds(IdSpec idSpec, GadgetToken token)
> + public List<String> getIds(IdSpec idSpec, SecurityToken token)
> throws JSONException {
> Map<String, List<String>> friendIds = fetcher.getFriendIds();
>
>
>
>