You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/09/07 10:02:18 UTC
svn commit: r993268 [1/8] - in /shindig/branches/2.0.x: ./ config/
content/container/ content/samplecontainer/ content/sampledata/
extras/src/main/java/org/apache/shindig/extras/
extras/src/main/java/org/apache/shindig/extras/as/ extras/src/main/java/o...
Author: lindner
Date: Tue Sep 7 08:02:11 2010
New Revision: 993268
URL: http://svn.apache.org/viewvc?rev=993268&view=rev
Log:
sync to trunk
Added:
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java
- copied unchanged from r993179, shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FakeTimeSource.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/model/
- copied from r993179, shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/model/
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java
- copied unchanged from r993179, shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/model/Model.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriter.java
- copied unchanged from r993179, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverVisitor.java
- copied unchanged from r993179, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverVisitor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java
- copied unchanged from r993179, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResourceMutateVisitor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
- copied unchanged from r993179, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsHandler.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/
- copied from r993179, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
- copied unchanged from r993179, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
- copied unchanged from r993179, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriterTest.java
- copied unchanged from r993179, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentTypeCharsetRemoverRewriterTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java
- copied unchanged from r993179, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/RewriterUtilsTest.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/GroupImpl.java
- copied unchanged from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/GroupImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Group.java
- copied unchanged from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Group.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java
- copied unchanged from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AlbumHandler.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/GroupHandler.java
- copied unchanged from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/GroupHandler.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
- copied, changed from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java
- copied, changed from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/AlbumService.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java
- copied unchanged from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java
- copied, changed from r993179, shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java
shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
- copied unchanged from r993179, shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
- copied unchanged from r993179, shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
shindig/branches/2.0.x/php/external/resources/
- copied from r993179, shindig/trunk/php/external/resources/
shindig/branches/2.0.x/php/external/resources/com/
- copied from r993179, shindig/trunk/php/external/resources/com/
shindig/branches/2.0.x/php/external/resources/com/google/
- copied from r993179, shindig/trunk/php/external/resources/com/google/
shindig/branches/2.0.x/php/external/resources/com/google/caja/
- copied from r993179, shindig/trunk/php/external/resources/com/google/caja/
shindig/branches/2.0.x/php/external/resources/com/google/caja/plugin/
- copied from r993179, shindig/trunk/php/external/resources/com/google/caja/plugin/
shindig/branches/2.0.x/php/external/resources/com/google/caja/plugin/domita-minified.js
- copied unchanged from r993179, shindig/trunk/php/external/resources/com/google/caja/plugin/domita-minified.js
shindig/branches/2.0.x/php/external/resources/com/google/caja/plugin/html-sanitizer-minified.js
- copied unchanged from r993179, shindig/trunk/php/external/resources/com/google/caja/plugin/html-sanitizer-minified.js
shindig/branches/2.0.x/php/external/resources/com/google/caja/plugin/valija.out.js
- copied unchanged from r993179, shindig/trunk/php/external/resources/com/google/caja/plugin/valija.out.js
shindig/branches/2.0.x/php/src/gadgets/servlet/ContentFilesServlet.php
- copied unchanged from r993179, shindig/trunk/php/src/gadgets/servlet/ContentFilesServlet.php
shindig/branches/2.0.x/php/src/gadgets/servlet/ResourcesFilesServlet.php
- copied unchanged from r993179, shindig/trunk/php/src/gadgets/servlet/ResourcesFilesServlet.php
shindig/branches/2.0.x/php/src/social/servlet/CompatibilityJsonRpcServlet.php
- copied unchanged from r993179, shindig/trunk/php/src/social/servlet/CompatibilityJsonRpcServlet.php
shindig/branches/2.0.x/php/test/gadgets/FilesServletTest.php
- copied unchanged from r993179, shindig/trunk/php/test/gadgets/FilesServletTest.php
Removed:
shindig/branches/2.0.x/features/src/main/javascript/features/org.jquery.core-1.4.2/
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.connect/
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.connect-1.0/
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/Pairs.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/util/FakeTimeSource.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/MakeRequestClient.java
Modified:
shindig/branches/2.0.x/ (props changed)
shindig/branches/2.0.x/COMMITTERS
shindig/branches/2.0.x/UPGRADING
shindig/branches/2.0.x/config/container.js
shindig/branches/2.0.x/content/container/sample-pubsub-2-publisher.xml
shindig/branches/2.0.x/content/container/sample-pubsub-2-subscriber.xml
shindig/branches/2.0.x/content/samplecontainer/samplecontainer.js
shindig/branches/2.0.x/content/sampledata/canonicaldb.json
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityStreamImpl.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityStream.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/spi/ActivityStreamService.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/sample/ActivityStreamsJsonDbService.java
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.4/OpenAjax-mashup.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.4/feature.xml
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.4/iframe.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
shindig/branches/2.0.x/features/src/main/javascript/features/container/container.js
shindig/branches/2.0.x/features/src/main/javascript/features/container/gadget_holder.js
shindig/branches/2.0.x/features/src/main/javascript/features/container/init.js
shindig/branches/2.0.x/features/src/main/javascript/features/container/service.js
shindig/branches/2.0.x/features/src/main/javascript/features/core.util/util.js
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/nix.transport.js
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/wpm.transport.js
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.container/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.container/shindig-container.js
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri.ext/util.js
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/AbstractSecurityToken.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenCodec.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodec.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenCodec.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/ForwardingSecurityToken.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/OAuthConstants.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenCodec.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/xml/XmlException.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/ELTypeConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/ExpressionProvider.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/Functions.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/RootELResolver.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperModule.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperProvider.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelProvider.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelTypeConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/DataCollection.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/Operation.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/RestfulCollection.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceClassMapper.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasMapping.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/InterfaceFieldAliasingMapper.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/model/EnumImpl.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/model/Exportablebean.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/PairTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanJsonConverterTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanXmlConverterTest.java
shindig/branches/2.0.x/java/gadgets/pom.xml
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGuiceModule.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/RenderingContext.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/UserPrefs.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ConfigContributor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/CoreUtilConfigContributor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/OsapiServicesConfigContributor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/ShindigAuthConfigContributor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/config/XhrwrapperConfigContributor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/BasicHttpFetcher.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpFetcher.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseMetadataHelper.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/RequestPipeline.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/AccessorInfo.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerKeyAndSecret.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGenerator.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthCallbackState.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthClientState.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlSerializer.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderModule.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AccelResponseRewriterRegistry.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/BaseTagRemoverRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CaptureRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultResponseRewriterRegistry.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingContentRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ResponseRewriterRegistry.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyContentRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorContentRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/TemplateRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/AccelHandler.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpRequestHandler.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Icon.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagRegistry.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistry.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/IfTagHandler.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AccelUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/AllJsIframeVersioner.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGenerator.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/IframeUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/LockedDomainPrefixGenerator.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/OAuthUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriModule.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriStatus.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/MessageSubstituter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/ModuleSubstituter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/Substituter.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/SubstituterModule.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthArgumentsTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthResponseParamsTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloaderTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriterTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleAdjacencyVisitorTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagExtractorVisitorTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetHandlerServiceTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/PipelinedDataTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultAccelUriManagerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/PassthruManager.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
shindig/branches/2.0.x/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic-expected.css
shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonActivityTest.java
shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaRestfulJsonPeopleTest.java
shindig/branches/2.0.x/java/server/src/main/webapp/WEB-INF/web.xml
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AccountImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ActivityImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AddressImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/AlbumImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/BodyTypeImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/ListFieldImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageCollectionImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/MessageImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/NameImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/model/OrganizationImpl.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthSecurityToken.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Album.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Drinker.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/LookingFor.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MessageCollection.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/NetworkPresence.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityHandler.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/PersonService.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/SampleModule.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamConverterTest.java
shindig/branches/2.0.x/php/NOTICE
shindig/branches/2.0.x/php/config/container.php
shindig/branches/2.0.x/php/external/OAuth/OAuth.php
shindig/branches/2.0.x/php/src/gadgets/ContainerConfig.php
shindig/branches/2.0.x/php/src/gadgets/GadgetFeatureRegistry.php
shindig/branches/2.0.x/php/src/gadgets/SigningFetcher.php
shindig/branches/2.0.x/php/src/gadgets/render/GadgetBaseRenderer.php
shindig/branches/2.0.x/php/src/gadgets/servlet/FilesServlet.php
shindig/branches/2.0.x/php/src/gadgets/templates/DataPipelining.php
shindig/branches/2.0.x/php/src/social/servlet/JsonRpcServlet.php
shindig/branches/2.0.x/php/test/ShindigAllTests.php
shindig/branches/2.0.x/php/test/gadgets/ContainerConfigTest.php
shindig/branches/2.0.x/pom.xml
Propchange: shindig/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Sep 7 08:02:11 2010
@@ -0,0 +1 @@
+site https://svn.apache.org/repos/asf/shindig/site/trunk
Propchange: shindig/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 7 08:02:11 2010
@@ -1 +1 @@
-/shindig/trunk:983949-988563
+/shindig/trunk:983949-993262
Modified: shindig/branches/2.0.x/COMMITTERS
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/COMMITTERS?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/COMMITTERS (original)
+++ shindig/branches/2.0.x/COMMITTERS Tue Sep 7 08:02:11 2010
@@ -34,6 +34,7 @@ Blanket commit access:
hsaputra Henry Saputra hsaputra@apache.org PMC Member
chaowang Jacky Wang chaowang@apache.org PMC Member
zhoresh Ziv Horesh zhoresh@apache.org PMC Member
+ gagan Gagandeep Singh gagan@apache.org PMC Member
fitz Brian Fitzpatrick fitz@apache.org Mentor
gstein Greg Stein gstein@apache.org Emeritus Mentor
sylvain Sylvain Wallez sylvain@apache.org Mentor
Modified: shindig/branches/2.0.x/UPGRADING
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/UPGRADING?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/UPGRADING (original)
+++ shindig/branches/2.0.x/UPGRADING Tue Sep 7 08:02:11 2010
@@ -17,6 +17,8 @@ The default RPC endpoints used for json-
* css for tabs/minimessage is now included in container.js
+* System properties shindig.host/jetty.host and shindig.port/jetty.port are injected as SERVER_HOST/SERVER_PORT
+
== Java Dependency Changes ==
Too many to mention. Check the top-level pom.xml for all the new versions.
@@ -125,6 +127,9 @@ The long value annotated with the name "
been moved to shindig/common/conf/shindig.properties. Guice 2.0 can inject Long values from Strings
automatically.
+The Executor.class injection is removed. Use ExecutorService.class injection instead.
+
+
* Rename SecurityTokenDecoder to SecurityTokenCodec
This class is renamed to provide a single place to capture both encoding and decoding work
Modified: shindig/branches/2.0.x/config/container.js
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/config/container.js?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/config/container.js (original)
+++ shindig/branches/2.0.x/config/container.js Tue Sep 7 08:02:11 2010
@@ -44,7 +44,8 @@
// Container must be an array; this allows multiple containers
// to share configuration.
-{"gadgets.container" : ["default"],
+// TODO: Move out accel container config into a separate accel.js file.
+{"gadgets.container" : ["default", "accel"],
// Set of regular expressions to validate the parent parameter. This is
// necessary to support situations where you want a single container to support
@@ -86,7 +87,7 @@
// Callback URL. Scheme relative URL for easy switch between https/http.
-"gadgets.oauthGadgetCallbackTemplate" : "//%host%/gadgets/oauthcallback",
+"gadgets.uri.oauth.callbackTemplate" : "//%host%/gadgets/oauthcallback",
// Use an insecure security token by default
"gadgets.securityTokenType" : "insecure",
@@ -249,7 +250,13 @@
"enableCaja" : false,
"supportedFields" : {
"person" : ["id", {"name" : ["familyName", "givenName", "unstructured"]}, "thumbnailUrl", "profileUrl"],
- "activity" : ["id", "title"]
+ "activity" : ["appId", "body", "bodyId", "externalId", "id", "mediaItems", "postedTime", "priority",
+ "streamFaviconUrl", "streamSourceUrl", "streamTitle", "streamUrl", "templateParams", "title",
+ "url", "userId"],
+ "album" : ["id", "thumbnailUrl", "title", "description", "location", "ownerId"],
+ "mediaItem" : ["album_id", "created", "description", "duration", "file_size", "id", "language", "last_updated",
+ "location", "mime_type", "num_comments", "num_views", "num_votes", "rating", "start_time",
+ "tagged_people", "tags", "thumbnail_url", "title", "type", "url"]
}
},
"osapi.services" : {
Modified: shindig/branches/2.0.x/content/container/sample-pubsub-2-publisher.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/container/sample-pubsub-2-publisher.xml?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/container/sample-pubsub-2-publisher.xml (original)
+++ shindig/branches/2.0.x/content/container/sample-pubsub-2-publisher.xml Tue Sep 7 08:02:11 2010
@@ -34,11 +34,9 @@
<Content type="html">
<![CDATA[
<script>
-var g = gadgets.byId(__MODULE_ID__);
-
function publish() {
var message = Math.random();
- g.PubSub.publish("org.apache.shindig.random-number", message);
+ gadgets.Hub.publish("org.apache.shindig.random-number", message);
document.getElementById("output").innerHTML = message;
}
Modified: shindig/branches/2.0.x/content/container/sample-pubsub-2-subscriber.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/container/sample-pubsub-2-subscriber.xml?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/container/sample-pubsub-2-subscriber.xml (original)
+++ shindig/branches/2.0.x/content/container/sample-pubsub-2-subscriber.xml Tue Sep 7 08:02:11 2010
@@ -35,10 +35,8 @@
<script>
var subId;
-var g = gadgets.byId(__MODULE_ID__);
-
// Example of setting a parameter to the HubClient used by pubsub-2 feature.
-g.PubSubSettings.params.HubClient.onSecurityAlert = function(alertSource, alertType) {
+gadgets.HubSettings.params.HubClient.onSecurityAlert = function(alertSource, alertType) {
alert("SECURITY ERROR!");
window.location.href = "about:blank";
};
@@ -50,11 +48,11 @@ function callback(topic, data, subscribe
}
function subscribe() {
- subId = g.PubSub.subscribe("org.apache.shindig.random-number", callback);
+ subId = gadgets.Hub.subscribe("org.apache.shindig.random-number", callback);
}
function unsubscribe() {
- g.PubSub.unsubscribe(subId);
+ gadgets.Hub.unsubscribe(subId);
document.getElementById("output").innerHTML = "";
}
Modified: shindig/branches/2.0.x/content/samplecontainer/samplecontainer.js
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/samplecontainer/samplecontainer.js?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/samplecontainer/samplecontainer.js (original)
+++ shindig/branches/2.0.x/content/samplecontainer/samplecontainer.js Tue Sep 7 08:02:11 2010
@@ -90,10 +90,15 @@ shindig.samplecontainer = {};
}
SampleContainerGadget = function(opt_params) {
- shindig.IfrGadget.call(this, opt_params);
+ shindig.BaseIfrGadget.call(this, opt_params);
+
+ // mix-in IfrGadget functions
+ for (var name in shindig.IfrGadget) if (shindig.IfrGadget.hasOwnProperty(name)) {
+ SampleContainerGadget[name] = shindig.IfrGadget[name];
+ }
};
- SampleContainerGadget.inherits(shindig.IfrGadget);
+ SampleContainerGadget.inherits(shindig.BaseIfrGadget);
SampleContainerGadget.prototype.getAdditionalParams = function() {
var params = '';
Modified: shindig/branches/2.0.x/content/sampledata/canonicaldb.json
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/sampledata/canonicaldb.json?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/sampledata/canonicaldb.json (original)
+++ shindig/branches/2.0.x/content/sampledata/canonicaldb.json Tue Sep 7 08:02:11 2010
@@ -369,6 +369,25 @@
}
}]
},
+"albums" : {
+ "john.doe": [{
+ "id" : "album123",
+ "ownerId" : "john.doe",
+ "thumbnailUrl" : "http://pages.example.org/albums/4433221-tn.png",
+ "title" : "Example Album",
+ "description" : "This is an example album, and this text is an example description",
+ "location" : { "latitude": 0, "longitude": 0 }
+ }]
+},
+"mediaItems" : {
+ "john.doe": [{
+ "id" : "mediaItem123",
+ "albumId" : "album123",
+ "mimeType" : "image/jpeg",
+ "type" : "image",
+ "url" : "http://animals.nationalgeographic.com/staticfiles/NGS/Shared/StaticFiles/animals/images/primary/black-spider-monkey.jpg"
+ }]
+},
//
// ----------------------------- Data ---------------------------------------
//
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/ShindigExtrasGuiceModule.java Tue Sep 7 08:02:11 2010
@@ -24,17 +24,21 @@ import com.google.inject.multibindings.M
import com.google.inject.name.Names;
/**
- * Configures the Extra modules in shindig-extras.
+ * Configures the Extra modules in shindig-extras.
*/
public class ShindigExtrasGuiceModule extends AbstractModule {
+ /** {@inheritDoc} */
@Override
protected void configure() {
configureExtraFeatures();
}
+ /**
+ * Adds the features-extras directory to the search path
+ */
protected void configureExtraFeatures() {
// This is how you add search paths for features.
- Multibinder<String> featureBinder = Multibinder.newSetBinder(binder(), String.class, Names.named("org.apache.shindig.features"));
+ Multibinder<String> featureBinder = Multibinder.newSetBinder(binder(), String.class, Names.named("org.apache.shindig.features-extended"));
featureBinder.addBinding().toInstance("res://features-extras/features.txt");
}
}
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.java Tue Sep 7 08:02:11 2010
@@ -30,6 +30,7 @@ import org.apache.shindig.extras.as.samp
* Configures the Extra modules in shindig-extras.
*/
public class ActivityStreamsGuiceModule extends AbstractModule {
+ /** {@inheritDoc} */
@Override
protected void configure() {
bind(ActivityStreamService.class).to(ActivityStreamsJsonDbService.class);
@@ -37,4 +38,4 @@ public class ActivityStreamsGuiceModule
Multibinder<Object> handlerBinder = Multibinder.newSetBinder(binder(), Object.class, Names.named("org.apache.shindig.handlers"));
handlerBinder.addBinding().toInstance(ActivityStreamsHandler.class);
}
-}
\ No newline at end of file
+}
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java Tue Sep 7 08:02:11 2010
@@ -19,29 +19,39 @@ package org.apache.shindig.extras.as.cor
import org.apache.shindig.extras.as.opensocial.model.ActionLink;
+/**
+ * A simple implementation of an ActionLink used by ActivityStreams.
+ */
public class ActionLinkImpl implements ActionLink {
- private String target;
- private String caption;
-
- public ActionLinkImpl() {
- this.target = null;
- this.caption = null;
- }
-
- public String getTarget() {
- return target;
- }
-
- public void setTarget(String target) {
- this.target = target;
- }
-
- public String getCaption() {
- return caption;
- }
-
- public void setCaption(String caption) {
- this.caption = caption;
- }
+ private String target;
+ private String caption;
+
+ /**
+ * Construct an empty ActionLinkImpl
+ */
+ public ActionLinkImpl() {
+ this.target = null;
+ this.caption = null;
+ }
+
+ /** {@inheritDoc} */
+ public String getTarget() {
+ return target;
+ }
+
+ /** {@inheritDoc} */
+ public void setTarget(String target) {
+ this.target = target;
+ }
+
+ /** {@inheritDoc} */
+ public String getCaption() {
+ return caption;
+ }
+
+ /** {@inheritDoc} */
+ public void setCaption(String caption) {
+ this.caption = caption;
+ }
}
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityEntryImpl.java Tue Sep 7 08:02:11 2010
@@ -23,119 +23,148 @@ import java.util.List;
import org.apache.shindig.extras.as.opensocial.model.ActivityEntry;
import org.apache.shindig.extras.as.opensocial.model.ActivityObject;
+/**
+ * A simple bean implementation of an ActivityStream Entry.
+ *
+ */
public class ActivityEntryImpl implements ActivityEntry {
- private String icon;
- private String time;
- private ActivityObject actor;
- private List<String> verb;
- private ActivityObject object;
- private ActivityObject target;
- private ActivityObject generator;
- private ActivityObject serviceProvider;
- private String title;
- private String body;
- private List<String> standardLink;
-
- public ActivityEntryImpl() {
- this.icon = null;
- this.time = null;
- this.actor = null;
- this.verb = null;
- this.object = null;
- this.target = null;
- this.generator = null;
- this.serviceProvider = null;
- this.title = null;
- this.body = null;
- this.standardLink = null;
- }
-
- public String getIcon() {
- return icon;
- }
-
- public void setIcon(String icon) {
- this.icon = icon;
- }
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- public ActivityObject getActor() {
- return actor;
- }
-
- public void setActor(ActivityObject actor) {
- this.actor = actor;
- }
-
- public List<String> getVerb() {
- return verb;
- }
-
- public void setVerb(List<String> verb) {
- this.verb = verb;
- }
-
- public ActivityObject getObject() {
- return object;
- }
-
- public void setObject(ActivityObject object) {
- this.object = object;
- }
-
- public ActivityObject getTarget() {
- return target;
- }
-
- public void setTarget(ActivityObject target) {
- this.target = target;
- }
-
- public ActivityObject getGenerator() {
- return generator;
- }
-
- public void setGenerator(ActivityObject generator) {
- this.generator = generator;
- }
-
- public ActivityObject getServiceProvider() {
- return serviceProvider;
- }
-
- public void setServiceProvider(ActivityObject serviceProvider) {
- this.serviceProvider = serviceProvider;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getBody() {
- return body;
- }
-
- public void setBody(String body) {
- this.body = body;
- }
-
- public List<String> getStandardLink() {
- return standardLink;
- }
-
- public void setStandardLink(List<String> standardLink) {
- this.standardLink = standardLink;
- }
+ private String icon;
+ private String time;
+ private ActivityObject actor;
+ private List<String> verb;
+ private ActivityObject object;
+ private ActivityObject target;
+ private ActivityObject generator;
+ private ActivityObject serviceProvider;
+ private String title;
+ private String body;
+ private List<String> standardLink;
+
+ /**
+ * Create a new empty ActivityEntry
+ */
+ public ActivityEntryImpl() {
+ this.icon = null;
+ this.time = null;
+ this.actor = null;
+ this.verb = null;
+ this.object = null;
+ this.target = null;
+ this.generator = null;
+ this.serviceProvider = null;
+ this.title = null;
+ this.body = null;
+ this.standardLink = null;
+ }
+
+ /** {@inheritDoc} */
+ public String getIcon() {
+ return icon;
+ }
+
+ /** {@inheritDoc} */
+ public void setIcon(String icon) {
+ this.icon = icon;
+ }
+
+ /** {@inheritDoc} */
+ public String getTime() {
+ return time;
+ }
+
+ /** {@inheritDoc} */
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ /** {@inheritDoc} */
+ public ActivityObject getActor() {
+ return actor;
+ }
+
+ /** {@inheritDoc} */
+ public void setActor(ActivityObject actor) {
+ this.actor = actor;
+ }
+
+ /** {@inheritDoc} */
+ public List<String> getVerb() {
+ return verb;
+ }
+
+ /** {@inheritDoc} */
+ public void setVerb(List<String> verb) {
+ this.verb = verb;
+ }
+
+ /** {@inheritDoc} */
+ public ActivityObject getObject() {
+ return object;
+ }
+
+ /** {@inheritDoc} */
+ public void setObject(ActivityObject object) {
+ this.object = object;
+ }
+
+ /** {@inheritDoc} */
+ public ActivityObject getTarget() {
+ return target;
+ }
+
+ /** {@inheritDoc} */
+ public void setTarget(ActivityObject target) {
+ this.target = target;
+ }
+
+ /** {@inheritDoc} */
+ public ActivityObject getGenerator() {
+ return generator;
+ }
+
+ /** {@inheritDoc} */
+ public void setGenerator(ActivityObject generator) {
+ this.generator = generator;
+ }
+
+ /** {@inheritDoc} */
+ public ActivityObject getServiceProvider() {
+ return serviceProvider;
+ }
+
+ /** {@inheritDoc} */
+ public void setServiceProvider(ActivityObject serviceProvider) {
+ this.serviceProvider = serviceProvider;
+ }
+
+ /** {@inheritDoc} */
+ public String getTitle() {
+ return title;
+ }
+
+ /** {@inheritDoc} */
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ /** {@inheritDoc} */
+ public String getBody() {
+ return body;
+ }
+
+ /** {@inheritDoc} */
+ public void setBody(String body) {
+ this.body = body;
+ }
+
+ /** {@inheritDoc} */
+ public List<String> getStandardLink() {
+ return standardLink;
+ }
+
+ /** {@inheritDoc} */
+ public void setStandardLink(List<String> standardLink) {
+ this.standardLink = standardLink;
+ }
}
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityObjectImpl.java Tue Sep 7 08:02:11 2010
@@ -24,149 +24,184 @@ import org.apache.shindig.extras.as.open
import org.apache.shindig.extras.as.opensocial.model.ActivityObject;
import org.apache.shindig.extras.as.opensocial.model.MediaLink;
+/**
+ * <p>ActivityObjectImpl class.</p>
+ *
+ */
public class ActivityObjectImpl implements ActivityObject {
-
- private String id;
- private String name;
- private String summary;
- private MediaLink media;
- private String permalink;
- private List<String> type;
- private ActivityObject inReplyTo;
- private List<ActivityObject> attached;
- private List<ActivityObject> reply;
- private List<ActivityObject> reaction;
- private ActionLink action;
- private List<String> upstreamDuplicateId;
- private List<String> downstreamDuplicateId;
- private String standardLink;
-
- public ActivityObjectImpl() {
- this.id = null;
- this.name = null;
- this.summary = null;
- this.media = null;
- this.permalink = null;
- this.type = null;
- this.inReplyTo = null;
- this.attached = null;
- this.reply = null;
- this.reaction = null;
- this.action = null;
- this.upstreamDuplicateId = null;
- this.downstreamDuplicateId = null;
- this.standardLink = null;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getSummary() {
- return summary;
- }
-
- public void setSummary(String summary) {
- this.summary = summary;
- }
-
- public MediaLink getMedia() {
- return media;
- }
-
- public void setMedia(MediaLink media) {
- this.media = media;
- }
-
- public String getPermalink() {
- return permalink;
- }
-
- public void setPermalink(String permalink) {
- this.permalink = permalink;
- }
-
- public List<String> getType() {
- return type;
- }
-
- public void setType(List<String> type) {
- this.type = type;
- }
-
- public ActivityObject getInReplyTo() {
- return inReplyTo;
- }
-
- public void setInReplyTo(ActivityObject inReplyTo) {
- this.inReplyTo = inReplyTo;
- }
-
- public List<ActivityObject> getAttached() {
- return attached;
- }
-
- public void setAttached(List<ActivityObject> attached) {
- this.attached = attached;
- }
-
- public List<ActivityObject> getReply() {
- return reply;
- }
-
- public void setReply(List<ActivityObject> reply) {
- this.reply = reply;
- }
-
- public List<ActivityObject> getReaction() {
- return reaction;
- }
-
- public void setReaction(List<ActivityObject> reaction) {
- this.reaction = reaction;
- }
-
- public ActionLink getAction() {
- return action;
- }
-
- public void setAction(ActionLink action) {
- this.action = action;
- }
-
- public List<String> getUpstreamDuplicateId() {
- return upstreamDuplicateId;
- }
-
- public void setUpstreamDuplicateId(List<String> upstreamDuplicateId) {
- this.upstreamDuplicateId = upstreamDuplicateId;
- }
-
- public List<String> getDownstreamDuplicateId() {
- return downstreamDuplicateId;
- }
-
- public void setDownstreamDuplicateId(List<String> downstreamDuplicateId) {
- this.downstreamDuplicateId = downstreamDuplicateId;
- }
-
- public String getStandardLink() {
- return standardLink;
- }
-
- public void setStandardLink(String standardLink) {
- this.standardLink = standardLink;
- }
+
+ private String id;
+ private String name;
+ private String summary;
+ private MediaLink media;
+ private String permalink;
+ private List<String> type;
+ private ActivityObject inReplyTo;
+ private List<ActivityObject> attached;
+ private List<ActivityObject> reply;
+ private List<ActivityObject> reaction;
+ private ActionLink action;
+ private List<String> upstreamDuplicateId;
+ private List<String> downstreamDuplicateId;
+ private String standardLink;
+
+ /**
+ * A simple implementation of an ActivtyObject
+ */
+ public ActivityObjectImpl() {
+ this.id = null;
+ this.name = null;
+ this.summary = null;
+ this.media = null;
+ this.permalink = null;
+ this.type = null;
+ this.inReplyTo = null;
+ this.attached = null;
+ this.reply = null;
+ this.reaction = null;
+ this.action = null;
+ this.upstreamDuplicateId = null;
+ this.downstreamDuplicateId = null;
+ this.standardLink = null;
+ }
+
+ /** {@inheritDoc} */
+ public String getId() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /** {@inheritDoc} */
+ public String getName() {
+ return name;
+ }
+
+ /** {@inheritDoc} */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /** {@inheritDoc} */
+ public String getSummary() {
+ return summary;
+ }
+
+ /** {@inheritDoc} */
+ public void setSummary(String summary) {
+ this.summary = summary;
+ }
+
+ /** {@inheritDoc} */
+ public MediaLink getMedia() {
+ return media;
+ }
+
+ /** {@inheritDoc} */
+ public void setMedia(MediaLink media) {
+ this.media = media;
+ }
+
+ /** {@inheritDoc} */
+ public String getPermalink() {
+ return permalink;
+ }
+
+ /** {@inheritDoc} */
+ public void setPermalink(String permalink) {
+ this.permalink = permalink;
+ }
+
+ /** {@inheritDoc} */
+ public List<String> getType() {
+ return type;
+ }
+
+ /** {@inheritDoc} */
+ public void setType(List<String> type) {
+ this.type = type;
+ }
+
+ /** {@inheritDoc} */
+ public ActivityObject getInReplyTo() {
+ return inReplyTo;
+ }
+
+ /** {@inheritDoc} */
+ public void setInReplyTo(ActivityObject inReplyTo) {
+ this.inReplyTo = inReplyTo;
+ }
+
+ /** {@inheritDoc} */
+ public List<ActivityObject> getAttached() {
+ return attached;
+ }
+
+ /** {@inheritDoc} */
+ public void setAttached(List<ActivityObject> attached) {
+ this.attached = attached;
+ }
+
+ /** {@inheritDoc} */
+ public List<ActivityObject> getReply() {
+ return reply;
+ }
+
+ /** {@inheritDoc} */
+ public void setReply(List<ActivityObject> reply) {
+ this.reply = reply;
+ }
+
+ /** {@inheritDoc} */
+ public List<ActivityObject> getReaction() {
+ return reaction;
+ }
+
+ /** {@inheritDoc} */
+ public void setReaction(List<ActivityObject> reaction) {
+ this.reaction = reaction;
+ }
+
+ /** {@inheritDoc} */
+ public ActionLink getAction() {
+ return action;
+ }
+
+ /** {@inheritDoc} */
+ public void setAction(ActionLink action) {
+ this.action = action;
+ }
+
+ /** {@inheritDoc} */
+ public List<String> getUpstreamDuplicateId() {
+ return upstreamDuplicateId;
+ }
+
+ /** {@inheritDoc} */
+ public void setUpstreamDuplicateId(List<String> upstreamDuplicateId) {
+ this.upstreamDuplicateId = upstreamDuplicateId;
+ }
+
+ /** {@inheritDoc} */
+ public List<String> getDownstreamDuplicateId() {
+ return downstreamDuplicateId;
+ }
+
+ /** {@inheritDoc} */
+ public void setDownstreamDuplicateId(List<String> downstreamDuplicateId) {
+ this.downstreamDuplicateId = downstreamDuplicateId;
+ }
+
+ /** {@inheritDoc} */
+ public String getStandardLink() {
+ return standardLink;
+ }
+
+ /** {@inheritDoc} */
+ public void setStandardLink(String standardLink) {
+ this.standardLink = standardLink;
+ }
}
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityStreamImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityStreamImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityStreamImpl.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActivityStreamImpl.java Tue Sep 7 08:02:11 2010
@@ -23,59 +23,75 @@ import java.util.List;
import org.apache.shindig.extras.as.opensocial.model.ActivityEntry;
import org.apache.shindig.extras.as.opensocial.model.ActivityStream;
+/**
+ * A simple, bean-based version of an ActivityStream
+ */
public class ActivityStreamImpl implements ActivityStream {
- private String displayName;
- private String language;
- private List<ActivityEntry> entries;
- private String id;
- private String subject;
-
- public ActivityStreamImpl() {
- this.displayName = null;
- this.language = null;
- this.entries = null;
- this.id = null;
- this.subject = null;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public List<ActivityEntry> getEntries() {
- return entries;
- }
-
- public String getId() {
- return id;
- }
-
- public String getLanguage() {
- return language;
- }
-
- public String getSubject() {
- return subject;
- }
-
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- public void setEntries(List<ActivityEntry> entries) {
- this.entries = entries;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public void setLanguage(String language) {
- this.language = language;
- }
-
- public void setSubject(String subject) {
- this.subject = subject;
- }
+ private String displayName;
+ private String language;
+ private List<ActivityEntry> entries;
+ private String id;
+ private String subject;
+
+ /**
+ * Create a new empty ActivityStream
+ */
+ public ActivityStreamImpl() {
+ this.displayName = null;
+ this.language = null;
+ this.entries = null;
+ this.id = null;
+ this.subject = null;
+ }
+
+ /** {@inheritDoc} */
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ /** {@inheritDoc} */
+ public List<ActivityEntry> getEntries() {
+ return entries;
+ }
+
+ /** {@inheritDoc} */
+ public String getId() {
+ return id;
+ }
+
+ /** {@inheritDoc} */
+ public String getLanguage() {
+ return language;
+ }
+
+ /** {@inheritDoc} */
+ public String getSubject() {
+ return subject;
+ }
+
+ /** {@inheritDoc} */
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ /** {@inheritDoc} */
+ public void setEntries(List<ActivityEntry> entries) {
+ this.entries = entries;
+ }
+
+ /** {@inheritDoc} */
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ /** {@inheritDoc} */
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ /** {@inheritDoc} */
+ public void setSubject(String subject) {
+ this.subject = subject;
+ }
}
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java Tue Sep 7 08:02:11 2010
@@ -19,59 +19,76 @@ package org.apache.shindig.extras.as.cor
import org.apache.shindig.extras.as.opensocial.model.MediaLink;
+/**
+ * <p>MediaLinkImpl class.</p>
+ *
+ */
public class MediaLinkImpl implements MediaLink {
-
- private String target;
- private String type;
- private String width;
- private String height;
- private String duration;
-
- public MediaLinkImpl() {
- this.target = null;
- this.type = null;
- this.width = null;
- this.height = null;
- this.duration = null;
- }
-
- public String getTarget() {
- return target;
- }
-
- public void setTarget(String target) {
- this.target = target;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getWidth() {
- return width;
- }
-
- public void setWidth(String width) {
- this.width = width;
- }
-
- public String getHeight() {
- return height;
- }
-
- public void setHeight(String height) {
- this.height = height;
- }
-
- public String getDuration() {
- return duration;
- }
-
- public void setDuration(String duration) {
- this.duration = duration;
- }
+
+ private String target;
+ private String type;
+ private String width;
+ private String height;
+ private String duration;
+
+ /**
+ * Create a new MediaLink
+ */
+ public MediaLinkImpl() {
+ this.target = null;
+ this.type = null;
+ this.width = null;
+ this.height = null;
+ this.duration = null;
+ }
+
+ /** {@inheritDoc} */
+ public String getTarget() {
+ return target;
+ }
+
+ /** {@inheritDoc} */
+ public void setTarget(String target) {
+ this.target = target;
+ }
+
+ /** {@inheritDoc} */
+ public String getType() {
+ return type;
+ }
+
+ /** {@inheritDoc} */
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /** {@inheritDoc} */
+ public String getWidth() {
+ return width;
+ }
+
+ /** {@inheritDoc} */
+ public void setWidth(String width) {
+ this.width = width;
+ }
+
+ /** {@inheritDoc} */
+ public String getHeight() {
+ return height;
+ }
+
+ /** {@inheritDoc} */
+ public void setHeight(String height) {
+ this.height = height;
+ }
+
+ /** {@inheritDoc} */
+ public String getDuration() {
+ return duration;
+ }
+
+ /** {@inheritDoc} */
+ public void setDuration(String duration) {
+ this.duration = duration;
+ }
}
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java Tue Sep 7 08:02:11 2010
@@ -25,46 +25,70 @@ import com.google.inject.ImplementedBy;
/*
* TODO: comment this class.
*/
+/**
+ * <p>ActionLink interface.</p>
+ *
+ */
@ImplementedBy(ActionLinkImpl.class)
@Exportablebean
public interface ActionLink {
-
- /*
- * Fields that represent JSON elements for an activity entry.
- */
- public static enum Field {
- TARGET("target"),
- CAPTION("caption");
-
- /*
- * The name of the JSON element.
- */
- private final String jsonString;
-
- /*
- * Constructs the field base for the JSON element.
- *
- * @param jsonString the name of the element
- */
- private Field(String jsonString) {
- this.jsonString = jsonString;
- }
-
- /*
- * Returns the name of the JSON element.
- *
- * @return String the name of the JSON element
- */
- public String toString() {
- return jsonString;
- }
- }
-
- String getTarget();
+
+ /**
+ * Fields that represent JSON elements for an activity entry.
+ */
+ public static enum Field {
+ TARGET("target"),
+ CAPTION("caption");
+
+ /*
+ * The name of the JSON element.
+ */
+ private final String jsonString;
+
+ /*
+ * Constructs the field base for the JSON element.
+ *
+ * @param jsonString the name of the element
+ */
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ /*
+ * Returns the name of the JSON element.
+ *
+ * @return String the name of the JSON element
+ */
+ public String toString() {
+ return jsonString;
+ }
+ }
+
+ /**
+ * Get the target of this action link
+ *
+ * @return a target
+ */
+ String getTarget();
- void setTarget(String target);
+ /**
+ * Set the target of this action link
+ *
+ * @param target a target
+ */
+ void setTarget(String target);
- String getCaption();
+ /**
+ * Get the caption for this action link.
+ *
+ * @return a caption
+ */
+ String getCaption();
- void setCaption(String caption);
+ /**
+ * Set the caption for this action link.
+ *
+ * @param caption a caption
+ */
+ void setCaption(String caption);
}
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java?rev=993268&r1=993267&r2=993268&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityEntry.java Tue Sep 7 08:02:11 2010
@@ -25,136 +25,248 @@ import org.apache.shindig.extras.as.core
import com.google.inject.ImplementedBy;
-/*
+/**
+ * <p>ActivityEntry interface.</p>
* TODO: comment a description for this class
* TODO: ensure verbs are up to date
* TODO: comment all classes
*/
+
@ImplementedBy(ActivityEntryImpl.class)
@Exportablebean
public interface ActivityEntry {
-
- /*
- * Fields that represent JSON elements for an activity entry.
- */
- public static enum Field {
- ICON("icon"),
- TIME("time"),
- ACTOR("actor"),
- VERB("verb"),
- OBJECT("object"),
- TARGET("target"),
- GENERATOR("generator"),
- SERVICE_PROVIDER("serviceProvider"),
- TITLE("title"),
- BODY("body"),
- STANDARD_LINK("standardLink");
-
- /*
- * The name of the JSON element.
- */
- private final String jsonString;
-
- /*
- * Constructs the field base for the JSON element.
- *
- * @param jsonString the name of the element
- */
- private Field(String jsonString) {
- this.jsonString = jsonString;
- }
-
- /*
- * Returns the name of the JSON element.
- *
- * @return String the name of the JSON element
- */
- public String toString() {
- return jsonString;
- }
- }
-
- /*
- * Possible verbs for an activity stream entry.
- */
- public static enum Verb {
- MARK_AS_FAVORITE("markAsFavorite"),
- START_FOLLOWING("startFollowing"),
- MARK_AS_LIKED("markAsLiked"),
- MAKE_FRIEND("makeFriend"),
- JOIN("join"),
- PLAY("play"),
- POST("post"),
- SAVE("save"),
- SHARE("share"),
- TAG("tag"),
- UPDATE("update");
-
- /*
- * The name of the JSON element.
- */
- private final String jsonString;
-
- /*
- * Constructs the field base for the JSON element.
- *
- * @param jsonString the name of the element
- */
- private Verb(String jsonString) {
- this.jsonString = jsonString;
- }
-
- /*
- * Returns the name of the JSON element.
- *
- * @return String the name of the JSON element
- */
- public String toString() {
- return jsonString;
- }
- }
-
- String getIcon();
-
- void setIcon(String icon);
-
- String getTime();
-
- void setTime(String time);
-
- ActivityObject getActor();
-
- void setActor(ActivityObject actor);
-
- List<String> getVerb();
-
- void setVerb(List<String> verb);
-
- ActivityObject getObject();
-
- void setObject(ActivityObject object);
-
- ActivityObject getTarget();
-
- void setTarget(ActivityObject target);
-
- ActivityObject getGenerator();
-
- void setGenerator(ActivityObject generator);
-
- ActivityObject getServiceProvider();
-
- void setServiceProvider(ActivityObject serviceProvider);
-
- String getTitle();
-
- void setTitle(String title);
-
- String getBody();
-
- void setBody(String body);
-
- List<String> getStandardLink();
-
- void setStandardLink(List<String> standardLink);
-}
\ No newline at end of file
+
+ /**
+ * Fields that represent JSON elements for an activity entry.
+ */
+ public static enum Field {
+ ICON("icon"),
+ TIME("time"),
+ ACTOR("actor"),
+ VERB("verb"),
+ OBJECT("object"),
+ TARGET("target"),
+ GENERATOR("generator"),
+ SERVICE_PROVIDER("serviceProvider"),
+ TITLE("title"),
+ BODY("body"),
+ STANDARD_LINK("standardLink");
+
+ /**
+ * The name of the JSON element.
+ */
+ private final String jsonString;
+
+ /**
+ * Constructs the field base for the JSON element.
+ *
+ * @param jsonString the name of the element
+ */
+ private Field(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ /**
+ * Returns the name of the JSON element.
+ *
+ * @return String the name of the JSON element
+ */
+ public String toString() {
+ return jsonString;
+ }
+ }
+
+ /**
+ * Possible verbs for an activity stream entry.
+ */
+ public static enum Verb {
+ MARK_AS_FAVORITE("markAsFavorite"),
+ START_FOLLOWING("startFollowing"),
+ MARK_AS_LIKED("markAsLiked"),
+ MAKE_FRIEND("makeFriend"),
+ JOIN("join"),
+ PLAY("play"),
+ POST("post"),
+ SAVE("save"),
+ SHARE("share"),
+ TAG("tag"),
+ UPDATE("update");
+
+ /**
+ * The name of the JSON element.
+ */
+ private final String jsonString;
+
+ /**
+ * Constructs the field base for the JSON element.
+ *
+ * @param jsonString the name of the element
+ */
+ private Verb(String jsonString) {
+ this.jsonString = jsonString;
+ }
+
+ /**
+ * Returns the name of the JSON element.
+ *
+ * @return String the name of the JSON element
+ */
+ public String toString() {
+ return jsonString;
+ }
+ }
+
+ /**
+ * <p>getIcon</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ String getIcon();
+
+ /**
+ * <p>setIcon</p>
+ *
+ * @param icon a {@link java.lang.String} object.
+ */
+ void setIcon(String icon);
+
+ /**
+ * <p>getTime</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ String getTime();
+
+ /**
+ * <p>setTime</p>
+ *
+ * @param time a {@link java.lang.String} object.
+ */
+ void setTime(String time);
+
+ /**
+ * <p>getActor</p>
+ *
+ * @return a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ ActivityObject getActor();
+
+ /**
+ * <p>setActor</p>
+ *
+ * @param actor a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ void setActor(ActivityObject actor);
+
+ /**
+ * <p>getVerb</p>
+ *
+ * @return a {@link java.util.List} object.
+ */
+ List<String> getVerb();
+
+ /**
+ * <p>setVerb</p>
+ *
+ * @param verb a {@link java.util.List} object.
+ */
+ void setVerb(List<String> verb);
+
+ /**
+ * <p>getObject</p>
+ *
+ * @return a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ ActivityObject getObject();
+
+ /**
+ * <p>setObject</p>
+ *
+ * @param object a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ void setObject(ActivityObject object);
+
+ /**
+ * <p>getTarget</p>
+ *
+ * @return a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ ActivityObject getTarget();
+
+ /**
+ * <p>setTarget</p>
+ *
+ * @param target a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ void setTarget(ActivityObject target);
+
+ /**
+ * <p>getGenerator</p>
+ *
+ * @return a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ ActivityObject getGenerator();
+
+ /**
+ * <p>setGenerator</p>
+ *
+ * @param generator a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ void setGenerator(ActivityObject generator);
+
+ /**
+ * <p>getServiceProvider</p>
+ *
+ * @return a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ ActivityObject getServiceProvider();
+
+ /**
+ * <p>setServiceProvider</p>
+ *
+ * @param serviceProvider a {@link org.apache.shindig.extras.as.opensocial.model.ActivityObject} object.
+ */
+ void setServiceProvider(ActivityObject serviceProvider);
+
+ /**
+ * <p>getTitle</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ String getTitle();
+
+ /**
+ * <p>setTitle</p>
+ *
+ * @param title a {@link java.lang.String} object.
+ */
+ void setTitle(String title);
+
+ /**
+ * <p>getBody</p>
+ *
+ * @return a {@link java.lang.String} object.
+ */
+ String getBody();
+
+ /**
+ * <p>setBody</p>
+ *
+ * @param body a {@link java.lang.String} object.
+ */
+ void setBody(String body);
+
+ /**
+ * <p>getStandardLink</p>
+ *
+ * @return a {@link java.util.List} object.
+ */
+ List<String> getStandardLink();
+
+ /**
+ * <p>setStandardLink</p>
+ *
+ * @param standardLink a {@link java.util.List} object.
+ */
+ void setStandardLink(List<String> standardLink);
+}