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/24 16:33:29 UTC
svn commit: r988569 [1/4] - in /shindig/branches/2.0.x: ./ assembly/
assembly/src/main/assembly/ config/ content/container/ extras/
extras/src/main/java/org/apache/shindig/extras/as/opensocial/service/
extras/src/main/javascript/features-extras/ extras...
Author: lindner
Date: Tue Aug 24 14:33:23 2010
New Revision: 988569
URL: http://svn.apache.org/viewvc?rev=988569&view=rev
Log:
merge trunk@984069
Added:
shindig/branches/2.0.x/content/container/sample-pubsub-2-publisher.xml
- copied unchanged from r988563, shindig/trunk/content/container/sample-pubsub-2-publisher.xml
shindig/branches/2.0.x/content/container/sample-pubsub-2-subscriber.xml
- copied unchanged from r988563, shindig/trunk/content/container/sample-pubsub-2-subscriber.xml
shindig/branches/2.0.x/content/container/sample-pubsub-2.html
- copied unchanged from r988563, shindig/trunk/content/container/sample-pubsub-2.html
shindig/branches/2.0.x/extras/NOTICE
- copied unchanged from r988563, shindig/trunk/extras/NOTICE
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.3/
- copied from r988563, shindig/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.3/
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.4/
- copied from r988563, shindig/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.4/
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.4/OpenAjax-mashup.js
- copied unchanged from r988563, shindig/trunk/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/crypto.js
- copied unchanged from r988563, shindig/trunk/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.4/crypto.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.4/feature.xml
- copied unchanged from r988563, shindig/trunk/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
- copied unchanged from r988563, shindig/trunk/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/
- copied from r988563, shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/pubsub-2/feature.xml
- copied unchanged from r988563, shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/feature.xml
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2-router.js
- copied unchanged from r988563, shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2-router.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
- copied unchanged from r988563, shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/pubsub-2.js
shindig/branches/2.0.x/extras/src/main/javascript/features-extras/pubsub-2/taming.js
- copied unchanged from r988563, shindig/trunk/extras/src/main/javascript/features-extras/pubsub-2/taming.js
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
- copied unchanged from r988563, shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetHandlerServiceTest.java
- copied unchanged from r988563, shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetHandlerServiceTest.java
shindig/branches/2.0.x/php/config/test.php
- copied unchanged from r988563, shindig/trunk/php/config/test.php
shindig/branches/2.0.x/php/external/dbunit.bat
- copied unchanged from r988563, shindig/trunk/php/external/dbunit.bat
shindig/branches/2.0.x/php/external/dbunit.php
- copied unchanged from r988563, shindig/trunk/php/external/dbunit.php
shindig/branches/2.0.x/php/external/phpunit.bat
- copied unchanged from r988563, shindig/trunk/php/external/phpunit.bat
shindig/branches/2.0.x/php/external/phpunit.php
- copied unchanged from r988563, shindig/trunk/php/external/phpunit.php
shindig/branches/2.0.x/php/src/social/converters/InputActivitiesConverter.php
- copied unchanged from r988563, shindig/trunk/php/src/social/converters/InputActivitiesConverter.php
shindig/branches/2.0.x/php/src/social/converters/InputAlbumsConverter.php
- copied unchanged from r988563, shindig/trunk/php/src/social/converters/InputAlbumsConverter.php
shindig/branches/2.0.x/php/src/social/converters/InputAppDataConverter.php
- copied unchanged from r988563, shindig/trunk/php/src/social/converters/InputAppDataConverter.php
shindig/branches/2.0.x/php/src/social/converters/InputInvalidateConverter.php
- copied unchanged from r988563, shindig/trunk/php/src/social/converters/InputInvalidateConverter.php
shindig/branches/2.0.x/php/src/social/converters/InputMediaItemsConverter.php
- copied unchanged from r988563, shindig/trunk/php/src/social/converters/InputMediaItemsConverter.php
shindig/branches/2.0.x/php/src/social/converters/InputMessagesConverter.php
- copied unchanged from r988563, shindig/trunk/php/src/social/converters/InputMessagesConverter.php
shindig/branches/2.0.x/php/src/social/converters/InputPeopleConverter.php
- copied unchanged from r988563, shindig/trunk/php/src/social/converters/InputPeopleConverter.php
shindig/branches/2.0.x/php/test/certs/
- copied from r988563, shindig/trunk/php/test/certs/
shindig/branches/2.0.x/php/test/certs/README
- copied unchanged from r988563, shindig/trunk/php/test/certs/README
shindig/branches/2.0.x/php/test/certs/private.key
- copied unchanged from r988563, shindig/trunk/php/test/certs/private.key
shindig/branches/2.0.x/php/test/certs/public.crt
- copied unchanged from r988563, shindig/trunk/php/test/certs/public.crt
shindig/branches/2.0.x/php/test/gadgets/GadgetUrlRendererTest.php
- copied unchanged from r988563, shindig/trunk/php/test/gadgets/GadgetUrlRendererTest.php
shindig/branches/2.0.x/php/test/social/InputActivitiesConverterTest.php
- copied unchanged from r988563, shindig/trunk/php/test/social/InputActivitiesConverterTest.php
shindig/branches/2.0.x/php/test/social/InputAlbumsConverterTest.php
- copied unchanged from r988563, shindig/trunk/php/test/social/InputAlbumsConverterTest.php
shindig/branches/2.0.x/php/test/social/InputAppDataConverterTest.php
- copied unchanged from r988563, shindig/trunk/php/test/social/InputAppDataConverterTest.php
shindig/branches/2.0.x/php/test/social/InputInvalidateConverterTest.php
- copied unchanged from r988563, shindig/trunk/php/test/social/InputInvalidateConverterTest.php
shindig/branches/2.0.x/php/test/social/InputMediaItemsConverterTest.php
- copied unchanged from r988563, shindig/trunk/php/test/social/InputMediaItemsConverterTest.php
shindig/branches/2.0.x/php/test/social/InputMessagesConverterTest.php
- copied unchanged from r988563, shindig/trunk/php/test/social/InputMessagesConverterTest.php
shindig/branches/2.0.x/php/test/social/InputPeopleConverterTest.php
- copied unchanged from r988563, shindig/trunk/php/test/social/InputPeopleConverterTest.php
Removed:
shindig/branches/2.0.x/php/make-release.sh
shindig/branches/2.0.x/php/src/social/converters/InputAtomConverter.php
shindig/branches/2.0.x/php/src/social/converters/InputJsonConverter.php
shindig/branches/2.0.x/php/src/social/converters/InputXmlConverter.php
shindig/branches/2.0.x/php/test/index.php
shindig/branches/2.0.x/php/test/social/InputAtomConverterTest.php
shindig/branches/2.0.x/php/test/social/InputJsonConverterTest.php
shindig/branches/2.0.x/php/test/social/InputXmlConverterTest.php
Modified:
shindig/branches/2.0.x/ (props changed)
shindig/branches/2.0.x/COMMITTERS
shindig/branches/2.0.x/NOTICE
shindig/branches/2.0.x/UPGRADING
shindig/branches/2.0.x/assembly/pom.xml
shindig/branches/2.0.x/assembly/src/main/assembly/java.xml
shindig/branches/2.0.x/assembly/src/main/assembly/php.xml
shindig/branches/2.0.x/config/OSML_library.xml (props changed)
shindig/branches/2.0.x/content/container/rpc_relay.html
shindig/branches/2.0.x/content/container/rpc_relay.uncompressed.html
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/javascript/features-extras/features.txt
shindig/branches/2.0.x/features/src/main/javascript/features/analytics/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/auth-refresh/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/caja/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/core/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/core.io/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/core.util/util.js
shindig/branches/2.0.x/features/src/main/javascript/features/dynamic-height/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/dynamic-height.util/feature.xml
shindig/branches/2.0.x/features/src/main/javascript/features/features.txt (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/flash/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/locked-domain/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/minimessage/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/oauthpopup/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-0.6/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-0.7/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-0.8/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-base/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-current/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-data/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-data-context/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-jsonrpc/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-reference/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-templates/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/pubsub/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/rpc/ (props changed)
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/setprefs/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/settitle/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/skins/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/tabs/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/tabs/tabs.js
shindig/branches/2.0.x/features/src/main/javascript/features/views/ (props changed)
shindig/branches/2.0.x/features/src/main/javascript/features/views/views.js
shindig/branches/2.0.x/features/src/main/javascript/features/xmlutil/ (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/core.io/iotest.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/core/authtest.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/core/config-test.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/core/prefstest.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/core/utiltest.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/mocks/ (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/oauthpopup/oauthpopup-test.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-base/jsonactivitytest.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-data-context/datacontexttest.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-reference/activitytest.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/compiler_test.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/container_test.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/loader_test.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/os_test.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/template_test.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/util_test.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/setprefs/setprefstest.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/views/requestnavigateto-test.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/views/urltemplatetest.js (props changed)
shindig/branches/2.0.x/features/src/test/javascript/features/views/views-init-test.js (contents, props changed)
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/OAuthUtil.java (props changed)
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/LruCacheProvider.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/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/util/CharsetUtil.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/jasper/JasperConversionModule.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/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/test/java/org/apache/shindig/common/AllTests.java (props changed)
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheProviderTest.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/testing/ (props changed)
shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.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/GadgetContext.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/features/FeatureResourceLoader.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/render/GadgetRewritersProvider.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (contents, props changed)
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/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/DomWalker.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/PipelineDataGadgetRewriter.java (props changed)
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/image/BaseOptimizer.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/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/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/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/ModulePrefs.java
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessor.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/XmlTemplateLibrary.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandler.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/AbstractTagRegistry.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistry.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandler.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandler.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/IfTagHandler.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandler.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TagHandler.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandler.java (props changed)
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/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/test/java/org/apache/shindig/gadgets/features/FeatureRegistryTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java (props changed)
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/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/PipelineDataGadgetRewriterTest.java (props changed)
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/StyleTagProxyEmbeddedUrlsVisitorTest.java
shindig/branches/2.0.x/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/ProxyHandlerTest.java
shindig/branches/2.0.x/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/spec/UserPrefTest.java
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/DefaultTemplateProcessorTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/XmlTemplateLibraryTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/AbstractTagHandlerTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistryTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/DefaultTagRegistryTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/FlashTagHandlerTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/HtmlTagHandlerTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/IfTagHandlerTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandlerTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/RepeatTagHandlerTest.java (props changed)
shindig/branches/2.0.x/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/tags/TemplateBasedTagHandlerTest.java (props changed)
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/server/src/main/java/org/apache/shindig/sample/container/SampleContainerGuiceModule.java
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/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/php/config/container.php
shindig/branches/2.0.x/php/src/common/Config.php
shindig/branches/2.0.x/php/src/common/HttpServlet.php
shindig/branches/2.0.x/php/src/common/sample/BasicRemoteContent.php
shindig/branches/2.0.x/php/src/common/sample/BasicRemoteContentFetcher.php
shindig/branches/2.0.x/php/src/common/sample/CacheStorageApc.php
shindig/branches/2.0.x/php/src/common/sample/CacheStorageMemcache.php
shindig/branches/2.0.x/php/src/gadgets/ContainerConfig.php
shindig/branches/2.0.x/php/src/gadgets/GadgetContext.php
shindig/branches/2.0.x/php/src/gadgets/MakeRequest.php
shindig/branches/2.0.x/php/src/gadgets/MakeRequestHandler.php
shindig/branches/2.0.x/php/src/gadgets/ProxyBase.php
shindig/branches/2.0.x/php/src/gadgets/render/GadgetBaseRenderer.php
shindig/branches/2.0.x/php/src/gadgets/render/GadgetUrlRenderer.php
shindig/branches/2.0.x/php/src/gadgets/rewrite/ContentRewriter.php
shindig/branches/2.0.x/php/src/gadgets/servlet/MakeRequestServlet.php
shindig/branches/2.0.x/php/src/social/converters/InputBasicXmlConverter.php
shindig/branches/2.0.x/php/src/social/converters/InputConverter.php
shindig/branches/2.0.x/php/src/social/sample/JsonDbOpensocialService.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/RestRequestItem.php
shindig/branches/2.0.x/php/src/social/service/SystemHandler.php
shindig/branches/2.0.x/php/src/social/servlet/ApiServlet.php
shindig/branches/2.0.x/php/src/social/servlet/DataServiceServlet.php
shindig/branches/2.0.x/php/test/ShindigAllTests.php
shindig/branches/2.0.x/php/test/common/BasicRemoteContentTest.php
shindig/branches/2.0.x/php/test/common/HttpServletTest.php
shindig/branches/2.0.x/php/test/gadgets/ContainerConfigTest.php
shindig/branches/2.0.x/php/test/gadgets/GadgetHtmlRendererTest.php
shindig/branches/2.0.x/php/test/gadgets/MakeRequestTest.php
shindig/branches/2.0.x/php/test/misc/upload/upload.xml
shindig/branches/2.0.x/php/test/social/MediaItemRestTest.php
shindig/branches/2.0.x/php/test/social/OutputAtomConverterTest.php
shindig/branches/2.0.x/php/test/social/OutputJsonConverterTest.php
shindig/branches/2.0.x/php/test/social/OutputXmlConverterTest.php
shindig/branches/2.0.x/php/test/social/RestBase.php
shindig/branches/2.0.x/php/test/social/RestRequestItemTest.php
shindig/branches/2.0.x/pom.xml
Propchange: shindig/branches/2.0.x/
------------------------------------------------------------------------------
svn:mergeinfo = /shindig/trunk:983949-988563
Modified: shindig/branches/2.0.x/COMMITTERS
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/COMMITTERS?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/COMMITTERS (original)
+++ shindig/branches/2.0.x/COMMITTERS Tue Aug 24 14:33:23 2010
@@ -11,6 +11,7 @@ Blanket commit access:
lindner Paul Lindner lindner@apache.org PMC Chair
agektmr Eiji Kitamura agektmr@apache.org PMC Member
+ bhofmann Bastian Hoffman bhofmann@apache.org PMC Member
brianm Brian McCallister brianm@apache.org PMC Member Mentor
chabotc Chris Chabot chabotc@apache.org PMC Member
dbentley Daniel Bentley dbentley@apache.org PMC Member
Modified: shindig/branches/2.0.x/NOTICE
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/NOTICE?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/NOTICE (original)
+++ shindig/branches/2.0.x/NOTICE Tue Aug 24 14:33:23 2010
@@ -33,3 +33,6 @@ Douglas Crockford (http://www.crockford
This product includes software (OAuth.php) developed by
Andy Smith (http://oauth.googlecode.com/svn/code/php/LICENSE.txt)
+
+This product includs software (OpenAjax Hub) developed by
+OpenAjax Alliance (http://www.openajax.org/)
Modified: shindig/branches/2.0.x/UPGRADING
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/UPGRADING?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/UPGRADING (original)
+++ shindig/branches/2.0.x/UPGRADING Tue Aug 24 14:33:23 2010
@@ -22,6 +22,7 @@ The default RPC endpoints used for json-
Too many to mention. Check the top-level pom.xml for all the new versions.
Here are some highlights:
+* slf4j dependencies are needed if you use the EhCache module See http://www.slf4j.org/manual.html
* guava replaces google-collections
* caja r3034 -> r4209
* guice 1.0->2.0
@@ -34,7 +35,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
+* commons-codec 1.3 -> 1.4
== Java Interface Changes ==
Modified: shindig/branches/2.0.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/assembly/pom.xml?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/assembly/pom.xml (original)
+++ shindig/branches/2.0.x/assembly/pom.xml Tue Aug 24 14:33:23 2010
@@ -146,6 +146,11 @@ year=${year}
</dependency>
<dependency>
<groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-extras</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shindig</groupId>
<artifactId>shindig-server</artifactId>
<version>${project.version}</version>
<type>war</type>
Modified: shindig/branches/2.0.x/assembly/src/main/assembly/java.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/assembly/src/main/assembly/java.xml?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/assembly/src/main/assembly/java.xml (original)
+++ shindig/branches/2.0.x/assembly/src/main/assembly/java.xml Tue Aug 24 14:33:23 2010
@@ -34,6 +34,7 @@
<include>org.apache.shindig:shindig-features</include>
<include>org.apache.shindig:shindig-gadgets</include>
<include>org.apache.shindig:shindig-social-api</include>
+ <include>org.apache.shindig:shindig-extras</include>
</includes>
</dependencySet>
</dependencySets>
@@ -66,7 +67,7 @@
</file>
<file>
<source>../java/NOTICE</source>
- <outputDirectory>shindig-${projet.version}-java</outputDirectory>
+ <outputDirectory>shindig-${project.version}-java</outputDirectory>
<filtered>true</filtered>
</file>
</files>
Modified: shindig/branches/2.0.x/assembly/src/main/assembly/php.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/assembly/src/main/assembly/php.xml?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/assembly/src/main/assembly/php.xml (original)
+++ shindig/branches/2.0.x/assembly/src/main/assembly/php.xml Tue Aug 24 14:33:23 2010
@@ -30,8 +30,9 @@
<directory>../</directory>
<includes>
<include>features/**</include>
- <include>javascript/**</include>
+ <include>content/**</include>
<include>config/**</include>
+ <include>extras/src/main/javascript/**</include>
</includes>
<excludes>
<exclude>site/**</exclude>
Propchange: shindig/branches/2.0.x/config/OSML_library.xml
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/content/container/rpc_relay.html
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/container/rpc_relay.html?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/container/rpc_relay.html (original)
+++ shindig/branches/2.0.x/content/container/rpc_relay.html Tue Aug 24 14:33:23 2010
@@ -23,5 +23,5 @@ try {
r = t.gadgets.rpc.receive;
} catch (e) {
}
-r && r(h);
+r && r(h, window);
</script>
Modified: shindig/branches/2.0.x/content/container/rpc_relay.uncompressed.html
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/container/rpc_relay.uncompressed.html?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/container/rpc_relay.uncompressed.html (original)
+++ shindig/branches/2.0.x/content/container/rpc_relay.uncompressed.html Tue Aug 24 14:33:23 2010
@@ -28,5 +28,5 @@ try {
} catch (e) {
}
-receive && receive(hashParams);
+receive && receive(hashParams, window);
</script>
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=988569&r1=988568&r2=988569&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 24 14:33:23 2010
@@ -34,7 +34,6 @@ import org.apache.shindig.social.opensoc
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;
import com.google.inject.Inject;
Modified: shindig/branches/2.0.x/extras/src/main/javascript/features-extras/features.txt
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/javascript/features-extras/features.txt?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/extras/src/main/javascript/features-extras/features.txt (original)
+++ shindig/branches/2.0.x/extras/src/main/javascript/features-extras/features.txt Tue Aug 24 14:33:23 2010
@@ -19,3 +19,5 @@
features-extras/org.jquery.core-1.4.2/feature.xml
features-extras/wave/feature.xml
features-extras/opensocial-payment/feature.xml
+features-extras/pubsub-2/feature.xml
+features-extras/org.openajax.hub-2.0.4/feature.xml
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/analytics/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/auth-refresh/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/caja/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/core/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/core.io/
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/features/src/main/javascript/features/core.util/util.js
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/core.util/util.js?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/core.util/util.js (original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/core.util/util.js Tue Aug 24 14:33:23 2010
@@ -119,12 +119,12 @@ gadgets['util'] = function() {
* @private Implementation detail.
*/
'getUrlParameters' : function (opt_url) {
- if (parameters !== null && typeof opt_url === "undefined") {
+ var no_opt_url = typeof opt_url === "undefined";
+ if (parameters !== null && no_opt_url) {
// "parameters" is a cache of current window params only.
return parameters;
}
var parsed = {};
- parameters = {};
var pairs = parseUrlParams(opt_url || document.location.href);
var unesc = window.decodeURIComponent ? decodeURIComponent : unescape;
for (var i = 0, j = pairs.length; i < j; ++i) {
@@ -140,7 +140,7 @@ gadgets['util'] = function() {
value = value.replace(/\+/g, " ");
parsed[argName] = unesc(value);
}
- if (typeof opt_url === "undefined") {
+ if (no_opt_url) {
// Cache current-window params in parameters var.
parameters = parsed;
}
@@ -189,8 +189,8 @@ gadgets['util'] = function() {
* @private Implementation detail.
*/
'makeEnum' : function (values) {
- var obj = {};
- for (var i = 0, v; (v = values[i]); ++i) {
+ var i, v, obj = {};
+ for (i = 0; (v = values[i]); ++i) {
obj[v] = v;
}
return obj;
@@ -326,6 +326,44 @@ gadgets['util'] = function() {
'unescapeString' : function(str) {
if (!str) return str;
return str.replace(/&#([0-9]+);/g, unescapeEntity);
+ },
+
+
+ /**
+ * Attach an event listener to given DOM element (Not a gadget standard)
+ *
+ * @param {object} elem DOM element on which to attach event.
+ * @param {string} eventName Event type to listen for.
+ * @param {function} callback Invoked when specified event occurs.
+ * @param {boolean} useCapture If true, initiates capture.
+ */
+ 'attachBrowserEvent': function(elem, eventName, callback, useCapture) {
+ if (typeof elem.addEventListener != 'undefined') {
+ elem.addEventListener(eventName, callback, useCapture);
+ } else if (typeof elem.attachEvent != 'undefined') {
+ elem.attachEvent('on' + eventName, callback);
+ } else {
+ gadgets.warn("cannot attachBrowserEvent: " + eventName);
+ }
+ },
+
+ /**
+ * Remove event listener. (Shindig internal implementation only)
+ *
+ * @param {object} elem DOM element from which to remove event.
+ * @param {string} eventName Event type to remove.
+ * @param {function} callback Listener to remove.
+ * @param {boolean} useCapture Specifies whether listener being removed was added with
+ * capture enabled.
+ */
+ 'removeBrowserEvent': function(elem, eventName, callback, useCapture) {
+ if (elem.removeEventListener) {
+ elem.removeEventListener(eventName, callback, useCapture);
+ } else if (elem.detachEvent){
+ elem.detachEvent('on' + eventName, callback);
+ } else {
+ gadgets.warn("cannot removeBrowserEvent: " + eventName);
+ }
}
};
}();
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/dynamic-height/
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/features/src/main/javascript/features/dynamic-height.util/feature.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/dynamic-height.util/feature.xml?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/dynamic-height.util/feature.xml (original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/dynamic-height.util/feature.xml Tue Aug 24 14:33:23 2010
@@ -22,4 +22,7 @@ specific language governing permissions
<gadget>
<script src="dynamic-height-util.js"/>
</gadget>
+ <container>
+ <script src="dynamic-height-util.js"/>
+ </container>
</feature>
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/features.txt
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/flash/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/locked-domain/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/minimessage/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/oauthpopup/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-0.6/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-0.7/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-0.8/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-base/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-current/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-data/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-data-context/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-jsonrpc/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-reference/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/opensocial-templates/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/pubsub/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/rpc/
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js (original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/rpc/rpc.js Tue Aug 24 14:33:23 2010
@@ -782,8 +782,12 @@ gadgets.rpc = function() {
getRelayUrl: function(targetId) {
var url = relayUrl[targetId];
// Some RPC methods (wpm, for one) are unhappy with schemeless URLs.
- if (url && url.indexOf('//') == 0) {
- url = document.location.protocol + url;
+ if (url && url.substring(0,1) === '/') {
+ if (url.substring(1,2) === '/') { // starts with '//'
+ url = document.location.protocol + url;
+ } else { // relative URL, starts with '/'
+ url = document.location.protocol + '//' + document.location.host + url;
+ }
}
return url;
Modified: shindig/branches/2.0.x/features/src/main/javascript/features/rpc/wpm.transport.js
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/rpc/wpm.transport.js?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/rpc/wpm.transport.js (original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/rpc/wpm.transport.js Tue Aug 24 14:33:23 2010
@@ -63,13 +63,7 @@ gadgets.rpctx.wpm = function() {
};
// Set up native postMessage handler.
- if (typeof window.addEventListener != 'undefined') {
- window.addEventListener('message', onmessage, false);
- } else if (typeof window.attachEvent != 'undefined') {
- window.attachEvent('onmessage', onmessage);
- } else {
- gadgets.warn("wpm init failure");
- }
+ gadgets.util.attachBrowserEvent(window, 'message', onmessage, false);
ready('..', true); // Immediately ready to send to parent.
return true;
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/setprefs/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/settitle/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/skins/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/tabs/
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/features/src/main/javascript/features/tabs/tabs.js
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/tabs/tabs.js?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/tabs/tabs.js (original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/tabs/tabs.js Tue Aug 24 14:33:23 2010
@@ -448,11 +448,7 @@ gadgets.TabSet.prototype.createTabTable_
var adjustNavigationFn = function() {
me.adjustNavigation_();
};
- if (window.addEventListener) {
- window.addEventListener('resize', adjustNavigationFn, false);
- } else if (window.attachEvent) {
- window.attachEvent('onresize', adjustNavigationFn);
- }
+ gadgets.util.attachBrowserEvent(window, "resize", adjustNavigationFn, false);
}
this.navTable_ = navTable;
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/views/
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/features/src/main/javascript/features/views/views.js
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/main/javascript/features/views/views.js?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/main/javascript/features/views/views.js (original)
+++ shindig/branches/2.0.x/features/src/main/javascript/features/views/views.js Tue Aug 24 14:33:23 2010
@@ -115,11 +115,7 @@ gadgets.views = function() {
currentView = supportedViews[urlParams.view] || supportedViews["default"];
if (conf.rewriteLinks) {
- if (document.attachEvent) {
- document.attachEvent("onclick", forceNavigate);
- } else {
- document.addEventListener("click", forceNavigate, false);
- }
+ gadgets.util.attachBrowserEvent(document, "click", forceNavigate, false);
}
}
Propchange: shindig/branches/2.0.x/features/src/main/javascript/features/xmlutil/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/core.io/iotest.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/core/authtest.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/core/config-test.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/core/prefstest.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/core/utiltest.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/mocks/
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/oauthpopup/oauthpopup-test.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-base/jsonactivitytest.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-data-context/datacontexttest.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-reference/activitytest.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/compiler_test.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/container_test.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/loader_test.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/os_test.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/template_test.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/opensocial-templates/util_test.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/setprefs/setprefstest.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/views/requestnavigateto-test.js
('svn:mergeinfo' removed)
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/views/urltemplatetest.js
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/features/src/test/javascript/features/views/views-init-test.js
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/features/src/test/javascript/features/views/views-init-test.js?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/features/src/test/javascript/features/views/views-init-test.js (original)
+++ shindig/branches/2.0.x/features/src/test/javascript/features/views/views-init-test.js Tue Aug 24 14:33:23 2010
@@ -80,10 +80,9 @@ ViewsInitTest.prototype.testRewriteLinks
attachEvent: function() {
name = arguments[0];
func = arguments[1];
+
},
- addEventListener: function() {
- self.fail("Tried to call addEventListener in IE.");
- }
+ addEventListener: undefined
};
gadgets.config.init({views:{rewriteLinks: true}});
Propchange: shindig/branches/2.0.x/features/src/test/javascript/features/views/views-init-test.js
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/java/common/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/pom.xml?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/pom.xml (original)
+++ shindig/branches/2.0.x/java/common/pom.xml Tue Aug 24 14:33:23 2010
@@ -147,7 +147,7 @@
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache</artifactId>
+ <artifactId>ehcache-core</artifactId>
</dependency>
<dependency>
<groupId>de.odysseus.juel</groupId>
@@ -172,5 +172,11 @@
<artifactId>xmlParserAPIs</artifactId>
<scope>test</scope>
</dependency>
+ <!-- needed for ehcache's use of slf4j -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java Tue Aug 24 14:33:23 2010
@@ -22,7 +22,6 @@ import com.google.common.base.Preconditi
import com.google.inject.Inject;
import org.apache.shindig.common.servlet.InjectedFilter;
-import org.apache.shindig.common.util.CharsetUtil;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
Propchange: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/CacheProvider.java Tue Aug 24 14:33:23 2010
@@ -28,7 +28,7 @@ public interface CacheProvider {
*
* @param <K> The Key type for the cache
* @param <V> The pay-load type
- * @param name The name of the cache.
+ * @param name The non-null name of the cache.
* @return A Cache configured to the required specification.
*/
<K, V> Cache<K, V> createCache(String name);
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/LruCacheProvider.java Tue Aug 24 14:33:23 2010
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.common.cache;
+import com.google.common.base.Preconditions;
import com.google.common.collect.MapMaker;
import com.google.inject.ConfigurationException;
import com.google.inject.Inject;
@@ -83,22 +84,15 @@ public class LruCacheProvider implements
@SuppressWarnings("unchecked")
public <K, V> Cache<K, V> createCache(String name) {
- int capacity = getCapacity(name);
- if (name == null) {
+ int capacity = getCapacity(Preconditions.checkNotNull(name));
+ Cache<K, V> cache = (Cache<K, V>) caches.get(name);
+ if (cache == null) {
if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("Creating anonymous cache");
+ LOG.fine("Creating cache named " + name);
}
- return new LruCache<K, V>(capacity);
- } else {
- Cache<K, V> cache = (Cache<K, V>) caches.get(name);
- if (cache == null) {
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("Creating cache named " + name);
- }
- cache = new LruCache<K, V>(capacity);
- caches.put(name, cache);
- }
- return cache;
+ cache = new LruCache<K, V>(capacity);
+ caches.put(name, cache);
}
+ return cache;
}
}
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java Tue Aug 24 14:33:23 2010
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.common.cache.ehcache;
+import com.google.common.base.Preconditions;
import org.apache.shindig.common.cache.Cache;
import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.common.util.ResourceLoader;
@@ -35,13 +36,14 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level;
import java.util.logging.Logger;
public class EhCacheCacheProvider implements CacheProvider {
private static final Logger LOG = Logger.getLogger(EhCacheCacheProvider.class.getName());
private final CacheManager cacheManager;
- private final Map<String, Cache<?, ?>> caches = new MapMaker().makeMap();
+ private final ConcurrentMap<String, Cache<?, ?>> caches = new MapMaker().makeMap();
@Inject
public EhCacheCacheProvider(@Named("shindig.cache.ehcache.config") String configPath,
@@ -97,22 +99,12 @@ public class EhCacheCacheProvider implem
@SuppressWarnings("unchecked")
public <K, V> Cache<K, V> createCache(String name) {
- if (name == null) {
+ if (!caches.containsKey(Preconditions.checkNotNull(name))) {
if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("Creating anonymous cache");
+ LOG.fine("Creating cache named " + name);
}
- return new EhConfiguredCache<K, V>(name, cacheManager);
- } else {
- Cache<K, V> cache = (Cache<K, V>) caches.get(name);
- if (cache == null) {
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("Creating cache named " + name);
- }
- cache = new EhConfiguredCache<K, V>(name, cacheManager);
- caches.put(name, cache);
- }
- return cache;
+ caches.putIfAbsent(name, new EhConfiguredCache<K, V>(name, cacheManager));
}
+ return (Cache<K, V>) caches.get(Preconditions.checkNotNull(name));
}
-
}
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhConfiguredCache.java Tue Aug 24 14:33:23 2010
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.common.cache.ehcache;
+import com.google.common.base.Preconditions;
+import net.sf.ehcache.ObjectExistsException;
import org.apache.shindig.common.cache.Cache;
import net.sf.ehcache.CacheManager;
@@ -32,11 +34,8 @@ public class EhConfiguredCache<K, V> imp
private net.sf.ehcache.Cache cache;
public EhConfiguredCache(String cacheName, CacheManager cacheManager) {
- if (cacheName == null) {
- cacheName = "default";
- }
synchronized (cacheManager) {
- cache = cacheManager.getCache(cacheName);
+ cache = cacheManager.getCache(Preconditions.checkNotNull(cacheName));
if (cache == null) {
cacheManager.addCache(cacheName);
cache = cacheManager.getCache(cacheName);
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/Uri.java Tue Aug 24 14:33:23 2010
@@ -176,7 +176,7 @@ public final class Uri {
result = new UriBuilder(this);
result.setFragment(relative.fragment);
result.setQuery(relative.query);
- String relativePath = Objects.firstNonNull(relative.path, "");;
+ String relativePath = Objects.firstNonNull(relative.path, "");
if (relativePath.startsWith("/")) { //$NON-NLS-1$
result.setPath(relativePath);
} else {
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java Tue Aug 24 14:33:23 2010
@@ -337,7 +337,7 @@ public final class UriBuilder {
return toString().equals(obj.toString());
}
- private static class ParamString {
+ private static final class ParamString {
private final Map<String, List<String>> params;
private String str;
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java Tue Aug 24 14:33:23 2010
@@ -23,7 +23,6 @@ import com.google.common.base.Charsets;
import org.apache.commons.lang.ArrayUtils;
import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
/**
* Utilities for dealing with character set encoding.
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java Tue Aug 24 14:33:23 2010
@@ -198,7 +198,7 @@ public class Expressions {
}
- private class ValueExpressionWrapper extends ValueExpression {
+ private static class ValueExpressionWrapper extends ValueExpression {
private static final long serialVersionUID = 2135607228206570229L;
private ValueExpression expression = null;
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperConversionModule.java Tue Aug 24 14:33:23 2010
@@ -30,6 +30,6 @@ import com.google.inject.Scopes;
public class JasperConversionModule extends AbstractModule {
@Override
protected void configure() {
- bind(ELTypeConverter.class).to(JasperTypeConverter.class).in(Scopes.SINGLETON);;
+ bind(ELTypeConverter.class).to(JasperTypeConverter.class).in(Scopes.SINGLETON);
}
}
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/expressions/juel/JuelModule.java Tue Aug 24 14:33:23 2010
@@ -29,6 +29,6 @@ import com.google.inject.Scopes;
public class JuelModule extends AbstractModule {
@Override
protected void configure() {
- bind(ExpressionProvider.class).to(JuelProvider.class).in(Scopes.SINGLETON);;
+ bind(ExpressionProvider.class).to(JuelProvider.class).in(Scopes.SINGLETON);
}
}
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java Tue Aug 24 14:33:23 2010
@@ -48,6 +48,11 @@ import java.util.Map;
*/
public class BeanDelegator {
+ /** Indicate NULL value for a field (To overcome shortcome of immutable map) */
+ public static final String NULL = "<NULL sentinel>";
+
+ private static final Map<String, Object> EMPTY_FIELDS = ImmutableMap.of();
+
/** List of Classes that are considered primitives and are not proxied **/
public static final ImmutableSet<Class<?>> PRIMITIVE_TYPE_CLASSES = ImmutableSet.of(
String.class, Integer.class, Long.class, Boolean.class, Uri.class);
@@ -57,6 +62,11 @@ public class BeanDelegator {
private final Map<Enum<?>, Enum<?>> enumConvertionMap;
+ public BeanDelegator() {
+ this(ImmutableMap.<Class<?>, Class<?>>of(),
+ ImmutableMap.<Enum<?>, Enum<?>>of());
+ }
+
public BeanDelegator(Map<Class<?>, Class<?>> delegatedClasses,
Map<Enum<?>, Enum<?>> enumConvertionMap) {
this.delegatedClasses = delegatedClasses;
@@ -69,7 +79,7 @@ public class BeanDelegator {
* @return proxied object according to map of classes to proxy
*/
public Object createDelegator(Object source) {
- if (source == null || delegatedClasses == null || delegatedClasses.size() == 0) {
+ if (source == null || delegatedClasses == null) {
return null;
}
@@ -113,12 +123,23 @@ public class BeanDelegator {
if (delegatedClasses.containsKey(source.getClass())) {
Class<?> apiInterface = delegatedClasses.get(source.getClass());
- return Proxy.newProxyInstance( apiInterface.getClassLoader(),
- new Class[] { apiInterface }, new DelegateInvocationHandler(source));
+ return createDelegator(source, apiInterface);
}
return source;
}
+ @SuppressWarnings("unchecked")
+ public <T> T createDelegator(Object source, Class<T> apiInterface) {
+ return createDelegator(source, apiInterface, EMPTY_FIELDS);
+ }
+
+ @SuppressWarnings("unchecked")
+ public <T> T createDelegator(Object source, Class<T> apiInterface,
+ Map<String, Object> extraFields) {
+ return (T) Proxy.newProxyInstance( apiInterface.getClassLoader(),
+ new Class[] { apiInterface }, new DelegateInvocationHandler(source, extraFields));
+ }
+
public Enum<?> convertEnum(Enum<?> value) {
if (enumConvertionMap.containsKey(value)) {
return enumConvertionMap.get(value);
@@ -129,10 +150,18 @@ public class BeanDelegator {
protected class DelegateInvocationHandler implements InvocationHandler {
/** Proxied object */
private final Object source;
+ /** Use the next values instead of proxying source */
+ private final Map<String, Object> extraFields;
public DelegateInvocationHandler(Object source) {
+ this(source, null);
+ }
+
+ public DelegateInvocationHandler(Object source, Map<String, Object> extraFields) {
Preconditions.checkNotNull(source);
+
this.source = source;
+ this.extraFields = (extraFields == null ? EMPTY_FIELDS : extraFields);
}
/**
@@ -141,6 +170,14 @@ public class BeanDelegator {
*/
public Object invoke(Object proxy, Method method, Object[] args) {
Class<?> sourceClass = source.getClass();
+ // Return proxy fields if available
+ if (!extraFields.isEmpty() && method.getName().startsWith("get")) {
+ String field = method.getName().substring(3).toLowerCase();
+ if (extraFields.containsKey(field)) {
+ Object data = extraFields.get(field);
+ return (data == NULL ? null : data);
+ }
+ }
try {
Method sourceMethod = sourceClass.getMethod(
method.getName(), method.getParameterTypes());
@@ -162,6 +199,7 @@ public class BeanDelegator {
/**
* Validate all proxied classes to see that all required functions are implemented.
* Throws exception if failed validation.
+ * Note that it ignore the extra fields support.
* @throws SecurityException
* @throws NoSuchMethodException
* @throws NoSuchFieldException
Modified: shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java (original)
+++ shindig/branches/2.0.x/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java Tue Aug 24 14:33:23 2010
@@ -24,7 +24,6 @@ import com.google.common.collect.Maps;
import org.apache.commons.lang.StringUtils;
-import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -35,6 +34,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Proxy;
import java.lang.reflect.Type;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -61,7 +61,7 @@ public class BeanFilter {
/** Annotation for required field that should not be filtered */
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
- public @interface Required {}
+ public @interface Unfiltered {}
/**
* Create a proxy object that filter object fields according to set of fields.
@@ -132,7 +132,7 @@ public class BeanFilter {
// Do not filter out primitive types, it will result in NPE
&& !method.getReturnType().isPrimitive()) {
// Look for Required annotation
- boolean required = (method.getAnnotation(Required.class) != null);
+ boolean required = (method.getAnnotation(Unfiltered.class) != null);
fieldName = prefix + method.getName().substring(3).toLowerCase();
if (!required && !fields.contains(fieldName)) {
return null;
@@ -158,7 +158,7 @@ public class BeanFilter {
}
}
- public Set<String> processBeanFields(Set<String> fields) {
+ public Set<String> processBeanFields(Collection<String> fields) {
ImmutableSet.Builder<String> builder = ImmutableSet.builder();
for (String field : fields) {
builder.add(field.toLowerCase());
Propchange: shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/AllTests.java
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheProviderTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheProviderTest.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheProviderTest.java (original)
+++ shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/LruCacheProviderTest.java Tue Aug 24 14:33:23 2010
@@ -42,12 +42,6 @@ public class LruCacheProviderTest {
assertEquals(10, getCache(provider, "foo").capacity);
}
- @Test
- public void defaultCapacityForAnonCache() throws Exception {
- LruCacheProvider provider = new LruCacheProvider(10);
- assertEquals(10, getCache(provider, null).capacity);
- }
-
LruCacheProvider createProvider(final String name, final String capacity, int defaultCapacity) {
Module module = new AbstractModule() {
@Override
Modified: shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java (original)
+++ shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProviderTest.java Tue Aug 24 14:33:23 2010
@@ -22,6 +22,7 @@ import org.apache.shindig.common.cache.C
import org.apache.shindig.common.cache.CacheProvider;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -29,24 +30,15 @@ import org.junit.Test;
*/
public class EhCacheCacheProviderTest {
- @Test
- public void getAnonCache() throws Exception {
- CacheProvider defaultProvider = new EhCacheCacheProvider(
+ static CacheProvider defaultProvider;
+ @BeforeClass
+ public static void setup() throws Exception {
+ defaultProvider = new EhCacheCacheProvider(
"res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml", true, true);
- Cache<String, String> cache = defaultProvider.createCache(null);
- Assert.assertNotNull(cache);
- Assert.assertNull(cache.getElement("test"));
- cache.addElement("test", "value1");
- Assert.assertEquals("value1", cache.getElement("test"));
- cache.removeElement("test");
- Assert.assertNull(cache.getElement("test"));
-
- }
+ }
@Test
public void getNamedCache() throws Exception {
- CacheProvider defaultProvider = new EhCacheCacheProvider(
- "res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml", true, true);
Cache<String, String> cache = defaultProvider.createCache("testcache");
Cache<String, String> cache2 = defaultProvider.createCache("testcache");
Assert.assertNotNull(cache);
Propchange: shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/common/testing/
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java (original)
+++ shindig/branches/2.0.x/java/common/src/test/java/org/apache/shindig/protocol/conversion/BeanDelegatorTest.java Tue Aug 24 14:33:23 2010
@@ -23,10 +23,11 @@ import com.google.common.collect.Immutab
import junit.framework.Assert;
-import org.apache.shindig.protocol.conversion.BeanFilter.Required;
+import org.apache.shindig.protocol.conversion.BeanFilter.Unfiltered;
import org.junit.Before;
import org.junit.Test;
+import java.beans.BeanInfo;
import java.util.List;
import java.util.Map;
@@ -53,7 +54,7 @@ public class BeanDelegatorTest extends A
public Style getStyle();
// Test of required
- @Required
+ @Unfiltered
public String getRequired();
}
@@ -197,6 +198,26 @@ public class BeanDelegatorTest extends A
assertEquals(item.getS(), interMap.get("item").getS());
}
+ class TokenData {
+ public String getId() { return "id"; }
+ }
+
+ interface TokenInter {
+ public String getId();
+ public String getContainer();
+ }
+
+ @Test
+ public void testExtraFields() {
+ TokenData data = new TokenData();
+ String container = "data";
+ TokenInter p = beanDelegator.createDelegator(data, TokenInter.class,
+ ImmutableMap.<String, Object>of("container", container));
+
+ assertSame(data.getId(), p.getId());
+ assertSame(container, p.getContainer());
+ }
+
// Make sure validate will actually fail
@Test(expected = NoSuchMethodException.class)
public void tesValidate() throws Exception {
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java Tue Aug 24 14:33:23 2010
@@ -28,7 +28,6 @@ import org.apache.shindig.common.uri.Uri
import org.apache.shindig.common.xml.XmlException;
import org.apache.shindig.common.xml.XmlUtil;
import org.apache.shindig.gadgets.http.RequestPipeline;
-import org.apache.shindig.gadgets.servlet.HtmlAccelServlet;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.SpecParserException;
import org.w3c.dom.Element;
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java Tue Aug 24 14:33:23 2010
@@ -17,7 +17,6 @@
*/
package org.apache.shindig.gadgets;
-import com.google.common.base.Objects;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.config.ContainerConfig;
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/BrowserSpecificFeatureResource.java Tue Aug 24 14:33:23 2010
@@ -156,7 +156,7 @@ public class BrowserSpecificFeatureResou
}
}
- private static class VersionMatcher {
+ private static final class VersionMatcher {
private static final Op[] OPS = {
new Op("^") {
public boolean match(String in, String key) {
@@ -214,7 +214,7 @@ public class BrowserSpecificFeatureResou
return false;
}
- private static VersionNumber num(String str) {
+ private static final VersionNumber num(String str) {
return new VersionNumber(str);
}
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java Tue Aug 24 14:33:23 2010
@@ -155,7 +155,7 @@ public class FeatureResourceLoader {
return dbg != null ? dbg : optContent.get();
}
- private class FileContent {
+ private final class FileContent {
private final String filePath;
private long lastModified;
private long lastUpdateCheckTime;
@@ -195,7 +195,7 @@ public class FeatureResourceLoader {
}
}
- private static class DualModeStaticResource extends FeatureResource.Default {
+ private static final class DualModeStaticResource extends FeatureResource.Default {
private final String content;
private final String debugContent;
@@ -214,7 +214,7 @@ public class FeatureResourceLoader {
}
}
- private static class UriResource implements FeatureResource {
+ private static final class UriResource implements FeatureResource {
private final HttpFetcher fetcher;
private final Uri uri;
private final boolean isInline;
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/SocialDataTags.java Tue Aug 24 14:33:23 2010
@@ -40,7 +40,7 @@ import org.w3c.dom.Document;
* irrespective whether this conversion occurred, ensuring that
* data pipelining and templating can work with any parser.
*/
-public class SocialDataTags {
+public final class SocialDataTags {
private SocialDataTags() { }
/**
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java Tue Aug 24 14:33:23 2010
@@ -24,7 +24,6 @@ import com.google.inject.name.Named;
import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
-import org.apache.shindig.gadgets.servlet.HtmlAccelServlet;
import java.util.List;
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Tue Aug 24 14:33:23 2010
@@ -44,7 +44,6 @@ import org.apache.commons.lang.StringUti
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
import java.util.Arrays;
@@ -231,7 +230,7 @@ public class RenderingGadgetRewriter imp
if (!externForcedLibs.isEmpty()) {
String jsUrl = jsUriManager.makeExternJsUri(gadget, externForcedLibs).toString();
Element libsTag = headTag.getOwnerDocument().createElement("script");
- libsTag.setAttribute("src", StringUtils.replace(jsUrl, "&", "&"));
+ libsTag.setAttribute("src", jsUrl.replace("&", "&"));
headTag.insertBefore(libsTag, firstHeadChild);
}
@@ -273,7 +272,7 @@ public class RenderingGadgetRewriter imp
if (!externGadgetLibs.isEmpty()) {
String jsUrl = jsUriManager.makeExternJsUri(gadget, externGadgetLibs).toString();
Element libsTag = headTag.getOwnerDocument().createElement("script");
- libsTag.setAttribute("src", StringUtils.replace(jsUrl, "&", "&"));
+ libsTag.setAttribute("src", jsUrl.replace("&", "&"));
headTag.insertBefore(libsTag, firstHeadChild);
}
} else {
@@ -318,7 +317,7 @@ public class RenderingGadgetRewriter imp
inlineJs.setLength(0);
}
Element referenceTag = headTag.getOwnerDocument().createElement("script");
- referenceTag.setAttribute("src", StringUtils.replace(theContent, "&", "&"));
+ referenceTag.setAttribute("src", theContent.replace("&", "&"));
headTag.insertBefore(referenceTag, firstHeadChild);
} else {
inlineJs.append(theContent).append(";\n");
Propchange: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
('svn:mergeinfo' removed)
Modified: shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java?rev=988569&r1=988568&r2=988569&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java (original)
+++ shindig/branches/2.0.x/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/AbsolutePathReferenceVisitor.java Tue Aug 24 14:33:23 2010
@@ -31,6 +31,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.Element;
import java.util.HashMap;
import java.util.List;
@@ -120,6 +121,14 @@ public class AbsolutePathReferenceVisito
String nodeName = node.getNodeName().toLowerCase();
if (node.getNodeType() == Node.ELEMENT_NODE &&
resourceTags.containsKey(nodeName)) {
+ if (nodeName.equals("link")) {
+ // Rewrite link only when it is for css.
+ String type = ((Element)node).getAttribute("type");
+ String rel = ((Element)node).getAttribute("rel");
+ if (!"stylesheet".equalsIgnoreCase(rel) || !"text/css".equalsIgnoreCase(type)) {
+ return null;
+ }
+ }
Attr attr = (Attr) node.getAttributes().getNamedItem(
resourceTags.get(nodeName));
String nodeUri = attr != null ? attr.getValue() : null;