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/08/10 13:32:34 UTC
svn commit: r983934 [1/8] - in /shindig/branches/2.0.x: ./ config/
content/container/ content/samplecontainer/examples/ActivityStreams/
extras/src/main/java/org/apache/shindig/extras/as/core/model/
extras/src/main/java/org/apache/shindig/extras/as/open...
Author: lindner
Date: Tue Aug 10 11:32:26 2010
New Revision: 983934
URL: http://svn.apache.org/viewvc?rev=983934&view=rev
Log:
merge trunk to 2.0.x
Added:
shindig/branches/2.0.x/content/container/payment-processor.html
- copied unchanged from r983931, shindig/trunk/content/container/payment-processor.html
shindig/branches/2.0.x/content/container/payment-records-processor.html
- copied unchanged from r983931, shindig/trunk/content/container/payment-records-processor.html
shindig/branches/2.0.x/content/container/sample-payment-container.html
- copied unchanged from r983931, shindig/trunk/content/container/sample-payment-container.html
shindig/branches/2.0.x/content/container/sample-payment.xml
- copied unchanged from r983931, shindig/trunk/content/container/sample-payment.xml
shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
- copied unchanged from r983931, shindig/trunk/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js
- copied unchanged from r983931, shindig/trunk/content/samplecontainer/examples/ActivityStreams/OpenSocialWrapper.js
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
- copied unchanged from r983931, shindig/trunk/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/MediaLinkImpl.java
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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/MediaLink.java
- copied unchanged from r983931, shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/opensocial-payment/
- copied from r983931, shindig/trunk/extras/src/main/javascript/features-extras/opensocial-payment/
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/opensocial-payment/billingitem.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/opensocial-payment/billingitem.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/opensocial-payment/container.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/opensocial-payment/container.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/opensocial-payment/feature.xml
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/opensocial-payment/feature.xml
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/opensocial-payment/jsoncontainer.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/opensocial-payment/jsoncontainer.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/opensocial-payment/jsonpayment.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/opensocial-payment/jsonpayment.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/opensocial-payment/opensocial.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/opensocial-payment/opensocial.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/opensocial-payment/payment.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/opensocial-payment/payment.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/opensocial-payment/paymentprocessor.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/opensocial-payment/paymentprocessor.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/
- copied from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/base.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/base.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/dynamic-width.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/dynamic-width.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/externs.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/externs.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/fake_gadgets.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/fake_gadgets.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/feature.xml
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/feature.xml
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/participant.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/participant.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/state.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/state.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/taming.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/taming.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/util.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/util.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/wave.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/wave.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/wave/wave.ui.js
- copied unchanged from r983931, shindig/trunk/extras/src/main/javascript/features-extras/wave/wave.ui.js
shindig/branches/2.0.x/features/src/main/javascript/features/core.config/configcontainer.js
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/core.config/configcontainer.js
shindig/branches/2.0.x/features/src/main/javascript/features/core.config/configgadget.js
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/core.config/configgadget.js
shindig/branches/2.0.x/features/src/main/javascript/features/jsondom/
- copied from r983931, shindig/trunk/features/src/main/javascript/features/jsondom/
shindig/branches/2.0.x/features/src/main/javascript/features/jsondom/feature.xml
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/jsondom/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/jsondom/jsondom.js
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/jsondom/jsondom.js
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.random/
- copied from r983931, shindig/trunk/features/src/main/javascript/features/shindig.random/
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.random/feature.xml
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/shindig.random/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.random/random.js
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/shindig.random/random.js
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.random/sha1.js
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/shindig.random/sha1.js
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri/
- copied from r983931, shindig/trunk/features/src/main/javascript/features/shindig.uri/
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri.ext/
- copied from r983931, shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri.ext/feature.xml
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri.ext/util.js
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/util.js
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri/feature.xml
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/shindig.uri/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/shindig.uri/uri.js
- copied unchanged from r983931, shindig/trunk/features/src/main/javascript/features/shindig.uri/uri.js
shindig/branches/2.0.x/features/src/test/javascript/features/jsondom/
- copied from r983931, shindig/trunk/features/src/test/javascript/features/jsondom/
shindig/branches/2.0.x/features/src/test/javascript/features/jsondom/jsondom-test.js
- copied unchanged from r983931, shindig/trunk/features/src/test/javascript/features/jsondom/jsondom-test.js
shindig/branches/2.0.x/features/src/test/javascript/features/shindig.uri/
- copied from r983931, shindig/trunk/features/src/test/javascript/features/shindig.uri/
shindig/branches/2.0.x/features/src/test/javascript/features/shindig.uri/uritest.js
- copied unchanged from r983931, shindig/trunk/features/src/test/javascript/features/shindig.uri/uritest.js
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenCodec.java
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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/SecurityTokenCodec.java
- copied unchanged from r983931, shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenCodec.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/ELTypeConverter.java
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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/jasper/
- copied from r983931, shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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/
- copied from r983931, shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/juel/
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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/conversion/BeanDelegator.java
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodecTest.java
- copied unchanged from r983931, shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenCodecTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/auth/DefaultSecurityTokenCodecTest.java
- copied unchanged from r983931, shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/DefaultSecurityTokenCodecTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/expressions/jasper/
- copied from r983931, shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java
- copied unchanged from r983931, shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/jasper/JasperExpressionsTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/expressions/juel/
- copied from r983931, shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/juel/
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/expressions/juel/JuelExpressionsTest.java
- copied unchanged from r983931, shindig/trunk/java/common/src/test/java/org/apache/shindig/expressions/juel/JuelExpressionsTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
- copied unchanged from r983931, shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java
- copied unchanged from r983931, shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanFilterTest.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/CajaResponseRewriter.java
- copied unchanged from r983931, shindig/trunk/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/rewrite/AccelResponseRewriterRegistry.java
- copied unchanged from r983931, shindig/trunk/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/OsTemplateXmlLoaderRewriter.java
- copied unchanged from r983931, shindig/trunk/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/StyleTagProxyEmbeddedUrlsRewriter.java
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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/servlet/GadgetsHandler.java
- copied unchanged from r983931, shindig/trunk/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
- copied unchanged from r983931, shindig/trunk/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/ServletUtil.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/CajaResponseRewriterTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/OsTemplateXmlLoaderRewriterTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitorTest.java
- copied unchanged from r983931, shindig/trunk/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/FakeIframeUriManager.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeIframeUriManager.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeProcessor.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/FakeProcessor.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletUtilTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java
- copied unchanged from r983931, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/UriUtilsTest.java
Removed:
shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/OpenSocialAPI.js
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityTokenDecoder.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoderTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/auth/DefaultSecurityTokenDecoderTest.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/old/
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/old/
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/old/
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/old/
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java
shindig/branches/2.0.x/java/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/old/
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/OSML_library.xml
shindig/branches/2.0.x/config/container.js
shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamGadget.xml
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/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/service/ActivityStreamsHandler.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/features.txt
shindig/branches/2.0.x/features/NOTICE
shindig/branches/2.0.x/features/pom.xml
shindig/branches/2.0.x/features/src/main/javascript/features/container/container.js
shindig/branches/2.0.x/features/src/main/javascript/features/container/feature.xml
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/container/util.js
shindig/branches/2.0.x/features/src/main/javascript/features/core.config/config.js
shindig/branches/2.0.x/features/src/main/javascript/features/core.config/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/core.io/io.js
shindig/branches/2.0.x/features/src/main/javascript/features/dynamic-height.util/dynamic-height-util.js
shindig/branches/2.0.x/features/src/main/javascript/features/features.txt
shindig/branches/2.0.x/features/src/main/javascript/features/minimessage/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/minimessage/minimessage.js
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-templates/base.js
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-templates/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-templates/jsTemplate/util.js
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-templates/loader.js
shindig/branches/2.0.x/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
shindig/branches/2.0.x/features/src/main/javascript/features/osapi/jsonrpctransport.js
shindig/branches/2.0.x/features/src/main/javascript/features/osapi/osapi.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/tabs/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/tabs/tabs.js
shindig/branches/2.0.x/features/src/test/javascript/features/alltests.js
shindig/branches/2.0.x/java/common/conf/shindig.properties
shindig/branches/2.0.x/java/common/pom.xml
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityToken.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/SecurityToken.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenException.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.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/crypto/BasicBlobCrypter.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/servlet/InjectedServlet.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/util/CharsetUtil.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/Expressions.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.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/DataServiceServletFetcher.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/expressions/ExpressionsTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/expressions/FunctionsTest.java
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/expressions/OpensocialFunctionsTest.java
shindig/branches/2.0.x/java/gadgets/pom.xml
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/Gadget.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.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/encoding/EncodingDetector.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.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/DefaultRequestPipeline.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.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/HttpResponseBuilder.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthModule.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.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/parse/DefaultHtmlSerializer.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.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/nekohtml/NekoSimplifiedHtmlParser.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelineExecutor.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/RenderingGadgetRewriter.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/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/BaseTagRemoverRewriter.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/DomWalker.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/MutableContent.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/RewriteModule.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.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/GadgetRenderingServlet.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/JsServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsonRpcHandler.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestServlet.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/ProxyHandler.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.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/PipelinedData.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateELResolver.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/DefaultJsUriManager.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/JsUriManager.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/UriUtils.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/variables/UserPrefSubstituter.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/DefaultInvalidationServiceTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseBuilderTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultServiceFetcherTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriterTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingProxyUriManagerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriterTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitorTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCase.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureTestCaseOS9.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/DefaultContentRewriterRegistryTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DomWalkerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/MutableContentTest.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/servlet/GadgetRenderingServletTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestServletTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/GadgetSpecTest.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/uri/DefaultAccelUriManagerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManagerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManagerTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.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/UriManagerTestBase.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/gadgets/src/test/resources/org/apache/shindig/gadgets/rewrite/rewritebasic.css
shindig/branches/2.0.x/java/samples/pom.xml
shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDataMapDb.java
shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java
shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/FriendDb.java
shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/OrganizationAddressDb.java
shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonAddressDb.java
shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/api/FilterSpecification.java
shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/hibernate/Bootstrap.java
shindig/branches/2.0.x/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/openjpa/Bootstrap.java
shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDbTest.java
shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiTestUtil.java
shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/integration/JpaTestGuiceModule.java
shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/PersonPopulate.java
shindig/branches/2.0.x/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/test/SchemaOpenJPATestOff.java
shindig/branches/2.0.x/java/server/pom.xml
shindig/branches/2.0.x/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndTest.java
shindig/branches/2.0.x/java/social-api/pom.xml
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomSource.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.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/PersonHandler.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
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/index.php
shindig/branches/2.0.x/php/src/common/Config.php
shindig/branches/2.0.x/php/src/common/RemoteContentRequest.php
shindig/branches/2.0.x/php/src/common/sample/BasicBlobCrypter.php
shindig/branches/2.0.x/php/src/common/sample/BasicOAuthLookupService.php
shindig/branches/2.0.x/php/src/common/sample/BasicSecurityToken.php
shindig/branches/2.0.x/php/src/gadgets/GadgetContext.php
shindig/branches/2.0.x/php/src/gadgets/GadgetFactory.php
shindig/branches/2.0.x/php/src/gadgets/GadgetFeatureRegistry.php
shindig/branches/2.0.x/php/src/gadgets/GadgetSpecParser.php
shindig/branches/2.0.x/php/src/gadgets/MakeRequestOptions.php
shindig/branches/2.0.x/php/src/gadgets/MetadataHandler.php
shindig/branches/2.0.x/php/src/gadgets/ProxyHandler.php
shindig/branches/2.0.x/php/src/gadgets/SigningFetcher.php
shindig/branches/2.0.x/php/src/gadgets/Substitutions.php
shindig/branches/2.0.x/php/src/gadgets/sample/BasicGadgetSpecFactory.php
shindig/branches/2.0.x/php/src/gadgets/servlet/GadgetRenderingServlet.php
shindig/branches/2.0.x/php/src/gadgets/servlet/JsServlet.php
shindig/branches/2.0.x/php/src/gadgets/servlet/MakeRequestServlet.php
shindig/branches/2.0.x/php/src/gadgets/servlet/ProxyServlet.php
shindig/branches/2.0.x/php/src/gadgets/templates/DataPipelining.php
shindig/branches/2.0.x/php/src/gadgets/templates/TemplateLibrary.php
shindig/branches/2.0.x/php/src/gadgets/templates/TemplateParser.php
shindig/branches/2.0.x/php/src/social/service/DataRequestHandler.php
shindig/branches/2.0.x/php/src/social/service/HttpHandler.php
shindig/branches/2.0.x/php/src/social/service/MediaItemHandler.php
shindig/branches/2.0.x/php/src/social/service/PersonHandler.php
shindig/branches/2.0.x/php/src/social/service/RequestItem.php
shindig/branches/2.0.x/php/src/social/servlet/ApiServlet.php
shindig/branches/2.0.x/pom.xml
Propchange: shindig/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 11:32:26 2010
@@ -1 +1 @@
-/shindig/trunk:945873-957805
+/shindig/trunk:945873-983931
Modified: shindig/branches/2.0.x/COMMITTERS
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/COMMITTERS?rev=983934&r1=983933&r2=983934&view=diff
==============================================================================
--- shindig/branches/2.0.x/COMMITTERS (original)
+++ shindig/branches/2.0.x/COMMITTERS Tue Aug 10 11:32:26 2010
@@ -30,6 +30,7 @@ Blanket commit access:
awiner Adam Winer awiner@apache.org PMC Member
chico Chico Charlesworth chico@apache.org PMC Member
chirag Chirag Shah chirag@apache.org PMC Member
+ hsaputra Henry Saputra hsaputra@apache.org PMC Member
chaowang Jacky Wang chaowang@apache.org PMC Member
zhoresh Ziv Horesh zhoresh@apache.org PMC Member
fitz Brian Fitzpatrick fitz@apache.org Mentor
Modified: shindig/branches/2.0.x/UPGRADING
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/UPGRADING?rev=983934&r1=983933&r2=983934&view=diff
==============================================================================
--- shindig/branches/2.0.x/UPGRADING (original)
+++ shindig/branches/2.0.x/UPGRADING Tue Aug 10 11:32:26 2010
@@ -5,7 +5,6 @@ Almost all interfaces have been updated
following information is not complete.
-
== container.js config changes ==
* gadgets.parentOrigins: Default ["*"] (NEW)
@@ -16,13 +15,15 @@ An array of valid origin domains for the
The default RPC endpoints used for json-rpc were moved from /gadgets/api/rpc and /social/rpc to just /rpc
+* css for tabs/minimessage is now included in container.js
== Java Dependency Changes ==
Too many to mention. Check the top-level pom.xml for all the new versions.
Here are some highlights:
-* caja r3034 -> r4067
+* guava replaces google-collections
+* caja r3034 -> r4209
* guice 1.0->2.0
* guice-multibindings (NEW)
* nekohtml 1.9.9 -> 1.9.13
@@ -33,6 +34,7 @@ Here are some highlights:
* ehcache 1.5 -> 1.6.2
* xstream 1.2 -> 1.3.1
* xpp3 1.1.3.3 -> 1.1.4c
+* commons-coded 1.3 -> 1.4
== Java Interface Changes ==
@@ -122,6 +124,12 @@ 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.
+* Rename SecurityTokenDecoder to SecurityTokenCodec
+
+This class is renamed to provide a single place to capture both encoding and decoding work
+for gadget security tokens. This also affects classes previously implementing SecurityTokenDecoder
+and previously extending DefaultSecurityTokenDecoder.
+
== PHP Changes ==
TBD
Modified: shindig/branches/2.0.x/config/OSML_library.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/config/OSML_library.xml?rev=983934&r1=983933&r2=983934&view=diff
==============================================================================
--- shindig/branches/2.0.x/config/OSML_library.xml (original)
+++ shindig/branches/2.0.x/config/OSML_library.xml Tue Aug 10 11:32:26 2010
@@ -32,21 +32,18 @@
${My.person.name.formatted}
</os:If>
<a href="${My.person.profileUrl}" if="${My.person.profileUrl}">${My.person.name.formatted}</a>
- </div>
+ </div>
</Template>
<TemplateDef tag="os:PeopleSelector">
<Template>
- <select onchange="os_PeopleSelector_onchange(this)"
- name="${My.inputName}"
- multiple="${My.multiple}"
- x-var="${My.var}"
- x-max="${My.max}"
- x-onselect="${My.onselect}">
- <option repeat="${My.group}" value="${Cur.id}" selected="${Cur.id == My.selected}">${Cur.name.formatted}</option>
+ <select onchange="os_PeopleSelector_onchange(this, '${My.var}', ${My.max ? My.max : 0}, '${My.onselect}')"
+ name="${My.inputName}"
+ multiple="${My.multiple}">
+ <option repeat="${My.group}" value="${Cur.id}" selected="${Cur.id == My.selected}">${Cur.name.formatted}</option>
</select>
</Template>
<JavaScript><![CDATA[
- function os_PeopleSelector_onchange(select) {
+ function os_PeopleSelector_onchange(select, varAttr, maxAttr, onSelectAttr) {
var selected;
if (!select.multiple) {
selected = select.options[select.selectedIndex].value;
@@ -57,13 +54,12 @@
selected.push(select.options[i].value);
}
}
- var max = select.getAttribute("x-max");
try {
- max = 1*max;
+ maxAttr = 1*maxAttr;
} catch (e) {
- max = 0;
+ maxAttr = 0;
}
- if (max && selected.length > max && select['x-selected']) {
+ if (maxAttr && selected.length > maxAttr && select['x-selected']) {
selected = select['x-selected'];
for (var i = 0; i < select.options.length; i++) {
select.options[i].selected = false;
@@ -76,20 +72,19 @@
}
}
}
- select['x-selected'] = selected;
- var varAttr = select.getAttribute("x-var");
+ select['x-selected'] = selected;
if (varAttr) {
if (opensocial.data) {
opensocial.data.getDataContext().putDataSet(varAttr, selected);
}
}
- var onSelect = select.getAttribute("x-onselect");
- if (onSelect) {
- if (window[onSelect] && typeof(window[onSelect]) == 'function') {
- window[onSelect](selected);
+
+ if (onSelectAttr) {
+ if (window[onSelectAttr] && typeof(window[onSelectAttr]) == 'function') {
+ window[onSelectAttr](selected);
} else {
if (!select['x-onselect-fn']) {
- select['x-onselect-fn'] = new Function(onSelect);
+ select['x-onselect-fn'] = new Function(onSelectAttr);
}
select['x-onselect-fn'].apply(select);
}
Modified: shindig/branches/2.0.x/config/container.js
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/config/container.js?rev=983934&r1=983933&r2=983934&view=diff
==============================================================================
--- shindig/branches/2.0.x/config/container.js (original)
+++ shindig/branches/2.0.x/config/container.js Tue Aug 10 11:32:26 2010
@@ -102,10 +102,10 @@
//"gadgets.securityTokenKeyFile" : "/path/to/key/file.txt",
// URI for the default shindig test instance.
-"defaultShindigTestHost": "http://localhost:${SERVER_PORT}",
+"defaultShindigTestHost": "http://${SERVER_HOST}:${SERVER_PORT}",
// Authority (host:port without scheme) for the proxy and concat servlets.
-"defaultShindigProxyConcatAuthority": "localhost:${SERVER_PORT}",
+"defaultShindigProxyConcatAuthority": "${SERVER_HOST}:${SERVER_PORT}",
// Default Uri config: these must be overridden - specified here for testing purposes
"gadgets.uri.iframe.unlockedDomain": "${Cur['defaultShindigTestHost']}",
@@ -149,6 +149,74 @@
"aliases" : ["FULL_PAGE"]
}
},
+ "tabs": {
+ "css" : [
+ ".tablib_table {",
+ "width: 100%;",
+ "border-collapse: separate;",
+ "border-spacing: 0px;",
+ "empty-cells: show;",
+ "font-size: 11px;",
+ "text-align: center;",
+ "}",
+ ".tablib_emptyTab {",
+ "border-bottom: 1px solid #676767;",
+ "padding: 0px 1px;",
+ "}",
+ ".tablib_spacerTab {",
+ "border-bottom: 1px solid #676767;",
+ "padding: 0px 1px;",
+ "width: 1px;",
+ "}",
+ ".tablib_selected {",
+ "padding: 2px;",
+ "background-color: #ffffff;",
+ "border: 1px solid #676767;",
+ "border-bottom-width: 0px;",
+ "color: #3366cc;",
+ "font-weight: bold;",
+ "width: 80px;",
+ "cursor: default;",
+ "}",
+ ".tablib_unselected {",
+ "padding: 2px;",
+ "background-color: #dddddd;",
+ "border: 1px solid #aaaaaa;",
+ "border-bottom-color: #676767;",
+ "color: #000000;",
+ "width: 80px;",
+ "cursor: pointer;",
+ "}",
+ ".tablib_navContainer {",
+ "width: 10px;",
+ "vertical-align: middle;",
+ "}",
+ ".tablib_navContainer a:link, ",
+ ".tablib_navContainer a:visited, ",
+ ".tablib_navContainer a:hover {",
+ "color: #3366aa;",
+ "text-decoration: none;",
+ "}"
+ ]
+ },
+ "minimessage": {
+ "css": [
+ ".mmlib_table {",
+ "width: 100%;",
+ "font: bold 9px arial,sans-serif;",
+ "background-color: #fff4c2;",
+ "border-collapse: separate;",
+ "border-spacing: 0px;",
+ "padding: 1px 0px;",
+ "}",
+ ".mmlib_xlink {",
+ "font: normal 1.1em arial,sans-serif;",
+ "font-weight: bold;",
+ "color: #0000cc;",
+ "cursor: pointer;",
+ "}"
+ ]
+ },
"rpc" : {
// Path to the relay file. Automatically appended to the parent
// parameter if it passes input validation and is not null.
@@ -188,7 +256,7 @@
// Specifying a binding to "container.listMethods" instructs osapi to dynamicaly introspect the services
// provided by the container and delay the gadget onLoad handler until that introspection is
// complete.
- // Alternatively a container can directly configure services here rather than having them
+ // Alternatively a container can directly configure services here rather than having them
// introspected. Simply list out the available servies and omit "container.listMethods" to
// avoid the initialization delay caused by gadgets.rpc
// E.g. "gadgets.rpc" : ["activities.requestCreate", "messages.requestSend", "requestShareApp", "requestPermission"]
@@ -196,7 +264,7 @@
},
"osapi" : {
// The endpoints to query for available JSONRPC/REST services
- "endPoints" : [ "http://%host%/rpc" ]
+ "endPoints" : [ "http://%host%/rpc" ]
},
"osml": {
// OSML library resource. Can be set to null or the empty string to disable OSML
Modified: shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamGadget.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamGadget.xml?rev=983934&r1=983933&r2=983934&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamGadget.xml (original)
+++ shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamGadget.xml Tue Aug 10 11:32:26 2010
@@ -25,115 +25,46 @@
</ModulePrefs>
<Content type="html">
- <![CDATA[
- <script type="text/javascript" src="OpenSocialAPI.js"></script>
+ <![CDATA[
+ <script type="text/javascript" src="OpenSocialWrapper.js"></script>
+ <script type="text/javascript" src="ActivityStreamsRender.js"></script>
<script type="text/javascript">
- // HTML for rendering
- var htmlWelcome = "";
- var htmlActivities = "";
- var htmlActivityEntries = "";
- var htmlCreateActivityEntry = "";
- var htmlDeleteActivityEntry = "";
- var htmlActivityEntryId = "";
+ social = new OpenSocialWrapper();
+ render = new ActivityStreamsRender();
- var viewer = null;
- var owner = null;
-
- // ================= PEOPLE =================
- function displayWelcome() {
- OpenSocialAPI.loadPeople(function(response) {
- viewer = response.viewer;
- owner = response.owner;
- var viewerFriends = response.viewerFriends;
- var ownerFriends = response.ownerFriends;
-
- htmlWelcome = "<h1>Welcome " + viewer.name.formatted + "!</h1>";
- htmlWelcome += "You are viewing " + owner.name.formatted + "'s data. <br><br>";
- htmlWelcome += "Here is a list of your friends: <br>";
- htmlWelcome += "<lu>";
- for(i = 0; i < viewerFriends.list.length; i++) {
- htmlWelcome += "<li>" + viewerFriends.list[i].name.formatted + "</li>";
- }
- htmlWelcome += "</lu>";
- refreshHTML();
- });
+ // TODO: move this stuff into ActivityStreamRender (if you can...)
+ // Renders retrieval of an ActivityEntry by ID
+ function renderActivityEntryId(div, callback) {
+ var html = "<h2>Work with an ActivityEntry</h2>";
+ html += "ActivityEntry ID: <input type='text' size=40 id='activityEntryId'>";
+ html += "<input type='button' value='Retrieve' onclick='retrieveActivityEntryId()'>";
+ html += "<input type='button' value='Delete' onclick='deleteActivityEntryId()'><br>";
+ html += "Note: you must be the owner of the ActivityEntry to retrieve it.";
+ html += "<textarea id='activityEntryText' cols=75 rows=10>No entry to display...</textarea><br>";
+ document.getElementById(div).innerHTML = html;
+ callback();
}
- // ================= ACTIVITIES =================
- function displayActivities() {
- OpenSocialAPI.loadActivities(function(response) {
- var viewerActivities = response.viewerActivities.list;
- var ownerActivities = response.ownerActivities.list;
-
- htmlActivities = "<h1>Activities</h1>";
- htmlActivities += "Demonstrates use of the Activities service in Apache Shindig. The ActivityStreams service does not interfere with this service.<br><br>";
- htmlActivities += "Activities for you and " + owner.name.formatted + ":<br>";
- htmlActivities += "<table border='1'>";
- htmlActivities += "<tr>";
- htmlActivities += "<td>Name</td>";
- htmlActivities += "<td>Title</td>";
- htmlActivities += "<td>Body</td>";
- htmlActivities += "<td>Images</td>";
- htmlActivities += "</tr>"
- processActivities(viewerActivities);
- processActivities(ownerActivities);
- htmlActivities += "</table>";
- refreshHTML();
+ // Deletes the activity entry
+ function deleteActivityEntryId() {
+ social.deleteActivityEntryById(document.getElementById('activityEntryId').value, function(response) {
+ document.getElementById('activityEntryText').value = 'No entry to display...';
+ render.renderActivityEntries('activityEntryies', refresh);
});
}
- function processActivities(activities) {
- for(idx = 0; idx < activities.length; idx++) {
- htmlActivities += "<tr>";
- htmlActivities += "<td>" + activities[idx].userId + "</td>";
- htmlActivities += "<td>" + activities[idx].title + "</td>";
- htmlActivities += "<td>" + activities[idx].body + "</td>";
- var mediaItems = activities[idx].mediaItems;
- if(mediaItems != null) {
- for(itemIdx = 0; itemIdx < mediaItems.length; itemIdx++) {
- if(mediaItems[itemIdx].type == "image") {
- htmlActivities += "<td><img src='" + mediaItems[itemIdx].url + "' width=150 height=150/></td>";
- }
- }
- }
- htmlActivities += "</tr>";
- }
- }
- // ================= ACTIVITYSTREAMS =================
- function displayActivityEntries() {
- OpenSocialAPI.loadActivityEntries(function(response) {
- viewerEntries = response.viewerEntries.list;
- ownerEntries = response.ownerEntries.list;
- htmlActivityEntries = "<h2>ActivityEntries</h2>";
- processActivityEntries(viewerEntries);
- processActivityEntries(ownerEntries);
- if (viewerEntries.length + ownerEntries.length == 0) {
- htmlActivityEntries += "<tr><td>No entries to show!</td></tr>";
- }
- htmlActivityEntries += "</table><br><br>";
- refreshHTML();
+ // Retrieves the activity entry
+ function retrieveActivityEntryId() {
+ social.getActivityEntryById(document.getElementById('activityEntryId').value, function(response) {
+ document.getElementById('activityEntryText').value = JSON.stringify(response);
});
}
- function processActivityEntries(entries) {
- for(idx = 0; idx < entries.length; idx++) {
- if(entries[idx].permalink && entries[idx].permalink != "null") {
- htmlActivityEntries += "<h3><a href='" + entries[idx].permalink + "'>" + entries[idx].title + "</a></h3>";
- } else {
- htmlActivityEntries += "<h3>" + entries[idx].title + "</h3>";
- }
- htmlActivityEntries += "ID: " + entries[idx].id + "<br>";
- htmlActivityEntries += "Actor: " + entries[idx].actor.displayName + "<br>";
- htmlActivityEntries += "Posted: " + entries[idx].postedTime + "<br>";
- if(entries[idx].body && entries[idx].body != "null") {
- htmlActivityEntries += "Body: " + entries[idx].body + "<br>";
- }
- }
- }
- function displayCreateActivityEntry() {
- htmlCreateActivityEntry = "<h1>ActivityStreams</h1>";
- htmlCreateActivityEntry += "Demonstrates use of the ActivityStream service in Apache Shindig. This implementation follows the current JSON draft specfication: http://activitystrea.ms/head/json-activity.html<br>";
+ // Creation form for activity entry
+ function renderCreateActivityEntry(div, callback) {
+ var htmlCreateActivityEntry = "<h1>ActivityStreams</h1>";
+ htmlCreateActivityEntry += "Demonstrates use of the ActivityStream service in Apache Shindig. This implementation follows the JSON draft specfication: http://activitystrea.ms/head/json-activity.html<br>";
htmlCreateActivityEntry += "<h2>Create an ActivityEntry</h2>";
htmlCreateActivityEntry += "<table>";
htmlCreateActivityEntry += "<tr>";
@@ -145,12 +76,12 @@
htmlCreateActivityEntry += "<td><input type='text' size=50 id='activityEntryBody'></td>"
htmlCreateActivityEntry += "</tr>";
htmlCreateActivityEntry += "<tr>";
- htmlCreateActivityEntry += "<td>Permalink</td>";
- htmlCreateActivityEntry += "<td><input type='text' size=50 id='activityEntryPermalink'></td>"
+ htmlCreateActivityEntry += "<td>Standard Link</td>";
+ htmlCreateActivityEntry += "<td><input type='text' size=50 id='activityEntryStandardLink'></td>"
htmlCreateActivityEntry += "</tr>";
htmlCreateActivityEntry += "<tr>";
- htmlCreateActivityEntry += "<td>Object Display Name</td>";
- htmlCreateActivityEntry += "<td><input type='text' size=50 id='activityObjectDisplayName'></td>"
+ htmlCreateActivityEntry += "<td>Object Name</td>";
+ htmlCreateActivityEntry += "<td><input type='text' size=50 id='activityObjectName'></td>"
htmlCreateActivityEntry += "</tr>";
htmlCreateActivityEntry += "<tr>";
htmlCreateActivityEntry += "<td>Object Summary</td>";
@@ -207,6 +138,8 @@
htmlCreateActivityEntry += "</table>";
htmlCreateActivityEntry += "<input type='button' value='Submit' onclick='createActivityEntry()'>";
htmlCreateActivityEntry += "<br><br>";
+ document.getElementById(div).innerHTML = htmlCreateActivityEntry;
+ callback();
}
function createActivityEntry() {
// Gather selected verbs
@@ -233,62 +166,42 @@
var title = blankToNull(document.getElementById('activityEntryTitle').value);
var body = blankToNull(document.getElementById('activityEntryBody').value)
- var permalink = blankToNull(document.getElementById('activityEntryPermalink').value);
- var objectDisplayName = blankToNull(document.getElementById('activityObjectDisplayName').value);
+ var standardLink = blankToNull(document.getElementById('activityEntryStandardLink').value);
+ var objectName = blankToNull(document.getElementById('activityObjectName').value);
var objectSummary = blankToNull(document.getElementById('activityObjectSummary').value);
var objectImage = blankToNull(document.getElementById('activityObjectImage').value);
var objectPermalink = blankToNull(document.getElementById('activityObjectPermalink').value);
- OpenSocialAPI.postActivityEntry(title, body, permalink, selVerbs, viewer.id, viewer.name.formatted,
- objectDisplayName, objectSummary, objectImage, objectPermalink, selTypes,
+ social.postActivityEntry(title, body, standardLink, selVerbs, viewer.id, viewer.name.formatted,
+ objectName, objectSummary, objectImage, objectPermalink, selTypes,
function(response) {
- displayActivityEntries();
+ render.renderActivityEntries('activityEntries', refresh);
});
}
function blankToNull(str) {
return (str == '' ? null : str);
}
-
-
- function displayActivityEntryId() {
- htmlActivityEntryId = "<h2>Work with an ActivityEntry</h2>";
- htmlActivityEntryId += "ActivityEntry ID: <input type='text' size=40 id='activityEntryId'>";
- htmlActivityEntryId += "<input type='button' value='Retrieve' onclick='retrieveActivityEntryId()'>";
- htmlActivityEntryId += "<input type='button' value='Delete' onclick='deleteActivityEntryId()'><br>";
- htmlActivityEntryId += "Note: you must be the owner of the ActivityEntry to retrieve it.";
- htmlActivityEntryId += "<textarea id='activityEntryText' cols=75 rows=10>No entry to display...</textarea><br>";
- }
- function deleteActivityEntryId() {
- OpenSocialAPI.deleteActivityEntryById(document.getElementById('activityEntryId').value, function(response) {
- displayActivityEntries();
- document.getElementById('activityEntryText').value = 'No entry to display...';
- });
- }
- function retrieveActivityEntryId() {
- OpenSocialAPI.getActivityEntryById(document.getElementById('activityEntryId').value, function(response) {
- document.getElementById('activityEntryText').value = JSON.stringify(response);
- });
- }
- // ================= SET UP =================
- // Rewrites the HTML content
- function refreshHTML() {
- document.getElementById('message').innerHTML = htmlWelcome + htmlActivities + htmlCreateActivityEntry + htmlActivityEntryId + htmlActivityEntries;
+ // Adjusts the window height
+ function refresh() {
gadgets.window.adjustHeight();
}
// Initializes the gadget
function init() {
- displayWelcome();
- displayActivities();
- displayCreateActivityEntry();
- displayActivityEntryId();
- displayActivityEntries();
- refreshHTML();
+ render.renderWelcome('welcome', refresh);
+ render.renderActivities('activities', refresh);
+ render.renderActivityEntries('activityEntries', refresh);
+ renderActivityEntryId('htmlGetEntry', refresh);
+ renderCreateActivityEntry('htmlCreateEntry', refresh);
}
gadgets.util.registerOnLoadHandler(init);
</script>
- <div id='message'></div>
+ <div id='welcome'></div>
+ <div id='activities'></div>
+ <div id='htmlCreateEntry'></div>
+ <div id='htmlGetEntry'></div>
+ <div id='activityEntries'></div>
]]>
</Content>
</Module>
\ No newline at end of file
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=983934&r1=983933&r2=983934&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 Aug 10 11:32:26 2010
@@ -25,107 +25,117 @@ import org.apache.shindig.extras.as.open
public class ActivityEntryImpl implements ActivityEntry {
- private String id;
- private String streamFavicon;
- private String postedTime;
+ private String icon;
+ private String time;
private ActivityObject actor;
private List<String> verb;
private ActivityObject object;
private ActivityObject target;
- private String permalink;
+ private ActivityObject generator;
+ private ActivityObject serviceProvider;
private String title;
private String body;
+ private List<String> standardLink;
public ActivityEntryImpl() {
- this.id = null;
- this.streamFavicon = null;
- this.postedTime = null;
+ this.icon = null;
+ this.time = null;
this.actor = null;
this.verb = null;
this.object = null;
this.target = null;
- this.permalink = null;
+ this.generator = null;
+ this.serviceProvider = null;
this.title = null;
this.body = null;
+ this.standardLink = null;
}
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getId() {
- return id;
+
+ public String getIcon() {
+ return icon;
}
-
- public void setStreamFavicon(String streamFavicon) {
- this.streamFavicon = streamFavicon;
+
+ public void setIcon(String icon) {
+ this.icon = icon;
}
-
- public String getStreamFavicon() {
- return streamFavicon;
+
+ public String getTime() {
+ return time;
}
-
- public void setPostedTime(String postedTime) {
- this.postedTime = postedTime;
+
+ public void setTime(String time) {
+ this.time = time;
}
-
- public String getPostedTime() {
- return postedTime;
+
+ public ActivityObject getActor() {
+ return actor;
}
-
+
public void setActor(ActivityObject actor) {
this.actor = actor;
}
-
- public ActivityObject getActor() {
- return actor;
+
+ public List<String> getVerb() {
+ return verb;
}
-
+
public void setVerb(List<String> verb) {
this.verb = verb;
}
-
- public List<String> getVerb() {
- return verb;
+
+ public ActivityObject getObject() {
+ return object;
}
-
+
public void setObject(ActivityObject object) {
this.object = object;
}
-
- public ActivityObject getObject() {
- return object;
+
+ public ActivityObject getTarget() {
+ return target;
}
-
+
public void setTarget(ActivityObject target) {
this.target = target;
}
-
- public ActivityObject getTarget() {
- return target;
+
+ public ActivityObject getGenerator() {
+ return generator;
}
-
- public void setPermalink(String permalink) {
- this.permalink = permalink;
+
+ public void setGenerator(ActivityObject generator) {
+ this.generator = generator;
}
-
- public String getPermalink() {
- return permalink;
+
+ public ActivityObject getServiceProvider() {
+ return serviceProvider;
}
-
- public void setTitle(String title) {
- this.title = title;
+
+ public void setServiceProvider(ActivityObject serviceProvider) {
+ this.serviceProvider = serviceProvider;
}
-
+
public String getTitle() {
return title;
}
-
- public void setBody(String body) {
- this.body = body;
+
+ 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;
+ }
}
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=983934&r1=983933&r2=983934&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 Aug 10 11:32:26 2010
@@ -20,46 +20,42 @@ package org.apache.shindig.extras.as.cor
import java.util.List;
+import org.apache.shindig.extras.as.opensocial.model.ActionLink;
import org.apache.shindig.extras.as.opensocial.model.ActivityObject;
+import org.apache.shindig.extras.as.opensocial.model.MediaLink;
public class ActivityObjectImpl implements ActivityObject {
private String id;
- private String displayName;
+ private String name;
private String summary;
+ private MediaLink media;
private String permalink;
- private String image;
- private List<String> objectType;
- private String content;
- private String audioStream;
- private String videoStream;
- private String playerApplet;
- private String bookmarkTarget;
- private String thumbnail;
- private String subject;
- private String description;
- private String rating;
- private String icon;
+ 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.displayName = null;
+ this.name = null;
this.summary = null;
+ this.media = null;
this.permalink = null;
- this.image = null;
- this.content = null;
- this.audioStream = null;
- this.videoStream = null;
- this.playerApplet = null;
- this.bookmarkTarget = null;
- this.thumbnail = null;
- this.subject = null;
- this.description = null;
- this.rating = null;
- this.icon = null;
- this.objectType = 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() {
@@ -70,12 +66,12 @@ public class ActivityObjectImpl implemen
this.id = id;
}
- public String getDisplayName() {
- return displayName;
+ public String getName() {
+ return name;
}
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
+ public void setName(String name) {
+ this.name = name;
}
public String getSummary() {
@@ -86,115 +82,91 @@ public class ActivityObjectImpl implemen
this.summary = summary;
}
- public String getPermalink() {
- return permalink;
- }
-
- public void setPermalink(String permalink) {
- this.permalink = permalink;
- }
-
- public String getImage() {
- return image;
- }
-
- public void setImage(String image) {
- this.image = image;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
+ public MediaLink getMedia() {
+ return media;
}
- public String getAudioStream() {
- return audioStream;
+ public void setMedia(MediaLink media) {
+ this.media = media;
}
- public void setAudioStream(String audioStream) {
- this.audioStream = audioStream;
- }
-
- public String getVideoStream() {
- return videoStream;
+ public String getPermalink() {
+ return permalink;
}
- public void setVideoStream(String videoStream) {
- this.videoStream = videoStream;
+ public void setPermalink(String permalink) {
+ this.permalink = permalink;
}
- public String getPlayerApplet() {
- return playerApplet;
+ public List<String> getType() {
+ return type;
}
- public void setPlayerApplet(String playerApplet) {
- this.playerApplet = playerApplet;
+ public void setType(List<String> type) {
+ this.type = type;
}
- public String getBookmarkTarget() {
- return bookmarkTarget;
+ public ActivityObject getInReplyTo() {
+ return inReplyTo;
}
- public void setBookmarkTarget(String bookmarkTarget) {
- this.bookmarkTarget = bookmarkTarget;
+ public void setInReplyTo(ActivityObject inReplyTo) {
+ this.inReplyTo = inReplyTo;
}
- public String getThumbnail() {
- return thumbnail;
+ public List<ActivityObject> getAttached() {
+ return attached;
}
- public void setThumbnail(String thumbnail) {
- this.thumbnail = thumbnail;
+ public void setAttached(List<ActivityObject> attached) {
+ this.attached = attached;
}
- public String getSubject() {
- return subject;
+ public List<ActivityObject> getReply() {
+ return reply;
}
- public void setSubject(String subject) {
- this.subject = subject;
+ public void setReply(List<ActivityObject> reply) {
+ this.reply = reply;
}
- public String getDescription() {
- return description;
+ public List<ActivityObject> getReaction() {
+ return reaction;
}
- public void setDescription(String description) {
- this.description = description;
+ public void setReaction(List<ActivityObject> reaction) {
+ this.reaction = reaction;
}
- public String getRating() {
- return rating;
+ public ActionLink getAction() {
+ return action;
}
- public void setRating(String rating) {
- this.rating = rating;
+ public void setAction(ActionLink action) {
+ this.action = action;
}
- public String getIcon() {
- return icon;
+ public List<String> getUpstreamDuplicateId() {
+ return upstreamDuplicateId;
}
- public void setIcon(String icon) {
- this.icon = icon;
+ public void setUpstreamDuplicateId(List<String> upstreamDuplicateId) {
+ this.upstreamDuplicateId = upstreamDuplicateId;
}
- public List<String> getObjectType() {
- return objectType;
+ public List<String> getDownstreamDuplicateId() {
+ return downstreamDuplicateId;
}
- public void setObjectType(List<String> objectType) {
- this.objectType = objectType;
+ public void setDownstreamDuplicateId(List<String> downstreamDuplicateId) {
+ this.downstreamDuplicateId = downstreamDuplicateId;
}
- public ActivityObject getInReplyTo() {
- return inReplyTo;
+ public String getStandardLink() {
+ return standardLink;
}
- public void setInReplyTo(ActivityObject inReplyTo) {
- this.inReplyTo = inReplyTo;
+ public void setStandardLink(String standardLink) {
+ this.standardLink = standardLink;
}
}
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=983934&r1=983933&r2=983934&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 Aug 10 11:32:26 2010
@@ -25,6 +25,11 @@ import org.apache.shindig.extras.as.core
import com.google.inject.ImplementedBy;
+/*
+ * 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 {
@@ -33,16 +38,17 @@ public interface ActivityEntry {
* Fields that represent JSON elements for an activity entry.
*/
public static enum Field {
- ID("id"),
- STREAM_FAVICON_("streamFavicon"),
- POSTED_TIME("postedTime"),
+ ICON("icon"),
+ TIME("time"),
ACTOR("actor"),
VERB("verb"),
OBJECT("object"),
TARGET("target"),
- PERMALINK_("permalink"),
+ GENERATOR("generator"),
+ SERVICE_PROVIDER("serviceProvider"),
TITLE("title"),
- BODY("body");
+ BODY("body"),
+ STANDARD_LINK("standardLink");
/*
* The name of the JSON element.
@@ -108,43 +114,47 @@ public interface ActivityEntry {
}
}
- void setId(String id);
-
- String getId();
-
- void setStreamFavicon(String streamFavicon);
-
- String getStreamFavicon();
-
- void setPostedTime(String postedTime);
-
- String getPostedTime();
-
- void setActor(ActivityObject actor);
-
+ String getIcon();
+
+ void setIcon(String icon);
+
+ String getTime();
+
+ void setTime(String time);
+
ActivityObject getActor();
-
- void setVerb(List<String> verb);
-
+
+ void setActor(ActivityObject actor);
+
List<String> getVerb();
-
- void setObject(ActivityObject object);
-
+
+ void setVerb(List<String> verb);
+
ActivityObject getObject();
-
- void setTarget(ActivityObject target);
+
+ void setObject(ActivityObject object);
ActivityObject getTarget();
- void setPermalink(String permalink);
-
- String getPermalink();
-
- void setTitle(String title);
+ void setTarget(ActivityObject target);
+ ActivityObject getGenerator();
+
+ void setGenerator(ActivityObject generator);
+
+ ActivityObject getServiceProvider();
+
+ void setServiceProvider(ActivityObject serviceProvider);
+
String getTitle();
-
- void setBody(String body);
-
+
+ void setTitle(String title);
+
String getBody();
+
+ void setBody(String body);
+
+ List<String> getStandardLink();
+
+ void setStandardLink(List<String> standardLink);
}
\ No newline at end of file
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java?rev=983934&r1=983933&r2=983934&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityObject.java Tue Aug 10 11:32:26 2010
@@ -34,22 +34,19 @@ public interface ActivityObject {
*/
public static enum Field {
ID("id"),
- DISPLAY_NAME("displayName"),
+ NAME("name"),
SUMMARY("summary"),
+ MEDIA("media"),
PERMALINK("permalink"),
- IMAGE("image"),
- CONTENT("content"),
- AUDIO_STREAM("audioStream"),
- VIDEO_STREAM("videoStream"),
- PLAYER_APPLET("playerApplet"),
- BOOKMARK_TARGET("bookmarkTarget"),
- THUMBNAIL("thumbnail"),
- SUBJECT("subject"),
- DESCRIPTION("description"),
- RATING("rating"),
- ICON("icon"),
+ TYPE("type"),
IN_REPLY_TO("inReplyTo"),
- OBJECT_TYPE("objectType");
+ ATTACHED("attached"),
+ REPLY("reply"),
+ REACTION("reaction"),
+ ACTION("action"),
+ UPSTREAM_DUPLICATE_ID("upstreamDuplicateId"),
+ DOWNSTREAM_DUPLICATE_ID("downstreamDuplicateId"),
+ STANDARD_LINK("standardLink");
/*
* The name of the JSON element.
@@ -79,67 +76,55 @@ public interface ActivityObject {
void setId(String id);
- String getDisplayName();
+ String getName();
- void setDisplayName(String displayName);
+ void setName(String name);
String getSummary();
void setSummary(String summary);
- String getPermalink();
-
- void setPermalink(String permalink);
-
- String getImage();
-
- void setImage(String image);
-
- String getContent();
-
- void setContent(String content);
+ MediaLink getMedia();
- String getAudioStream();
+ void setMedia(MediaLink media);
- void setAudioStream(String audioStream);
+ String getPermalink();
- String getVideoStream();
+ void setPermalink(String permalink);
- void setVideoStream(String videoStream);
+ List<String> getType();
- String getPlayerApplet();
+ void setType(List<String> type);
- void setPlayerApplet(String playerApplet);
+ ActivityObject getInReplyTo();
- String getBookmarkTarget();
+ void setInReplyTo(ActivityObject inReplyTo);
- void setBookmarkTarget(String bookmarkTarget);
-
- String getThumbnail();
+ List<ActivityObject> getAttached();
- void setThumbnail(String thumbnail);
+ void setAttached(List<ActivityObject> attached);
- String getSubject();
+ List<ActivityObject> getReply();
- void setSubject(String subject);
+ void setReply(List<ActivityObject> reply);
- String getDescription();
+ List<ActivityObject> getReaction();
- void setDescription(String description);
+ void setReaction(List<ActivityObject> reaction);
- String getRating();
+ ActionLink getAction();
- void setRating(String rating);
+ void setAction(ActionLink action);
- String getIcon();
+ List<String> getUpstreamDuplicateId();
- void setIcon(String icon);
+ void setUpstreamDuplicateId(List<String> upstreamDuplicateId);
- List<String> getObjectType();
+ List<String> getDownstreamDuplicateId();
- void setObjectType(List<String> objectType);
+ void setDownstreamDuplicateId(List<String> downstreamDuplicateId);
- ActivityObject getInReplyTo();
+ String getStandardLink();
- void setInReplyTo(ActivityObject inReplyTo);
+ void setStandardLink(String standardLink);
}
\ No newline at end of file
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityStream.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityStream.java?rev=983934&r1=983933&r2=983934&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityStream.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActivityStream.java Tue Aug 10 11:32:26 2010
@@ -15,14 +15,14 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-
package org.apache.shindig.extras.as.opensocial.model;
import java.util.List;
-import org.apache.shindig.protocol.model.Exportablebean;
import org.apache.shindig.extras.as.core.model.ActivityStreamImpl;
+import org.apache.shindig.protocol.model.Exportablebean;
+
import com.google.inject.ImplementedBy;
/*
Modified: shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java?rev=983934&r1=983933&r2=983934&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java (original)
+++ shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/ActivityStreamsHandler.java Tue Aug 10 11:32:26 2010
@@ -33,6 +33,7 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.spi.CollectionOptions;
import org.apache.shindig.social.opensocial.spi.UserId;
+import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -146,12 +147,8 @@ public class ActivityStreamsHandler {
@Operation(httpMethods = "GET", path="/@supportedFields")
public List<Object> supportedFields(RequestItem request) {
// TODO: Would be nice if name in config matched name of service.
- String container = firstNonNull(request.getToken().getContainer(), ContainerConfig.DEFAULT_CONTAINER);
+ String container = Objects.firstNonNull(request.getToken().getContainer(), ContainerConfig.DEFAULT_CONTAINER);
return config.getList(container,
"${Cur['gadgets.features'].opensocial.supportedFields.activitystream}");
}
-
- private static <T> T firstNonNull(T first, T second) {
- return first != null ? first : Preconditions.checkNotNull(second);
- }
}