You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by bh...@apache.org on 2011/10/28 01:20:49 UTC
svn commit: r1190083 [1/5] - in
/shindig/branches/php_namespace_refactoring/php/src/apache: ./ shindig/
shindig/common/ shindig/common/sample/ shindig/gadgets/
shindig/gadgets/oauth/ shindig/gadgets/render/ shindig/gadgets/rewrite/
shindig/gadgets/samp...
Author: bhofmann
Date: Thu Oct 27 23:20:41 2011
New Revision: 1190083
URL: http://svn.apache.org/viewvc?rev=1190083&view=rev
Log:
namespace refactoring
Added:
shindig/branches/php_namespace_refactoring/php/src/apache/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/FrontController.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/bootstrap.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/AuthenticationMode.php
- copied, changed from r1186446, shindig/trunk/php/src/common/AuthenticationMode.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypter.php
- copied, changed from r1186446, shindig/trunk/php/src/common/BlobCrypter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypterException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Cache.php
- copied, changed from r1186446, shindig/trunk/php/src/common/Cache.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheStorage.php
- copied, changed from r1186446, shindig/trunk/php/src/common/CacheStorage.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Config.php
- copied, changed from r1186446, shindig/trunk/php/src/common/Config.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ConfigException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/File.php
- copied, changed from r1186446, shindig/trunk/php/src/common/File.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/HttpServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/common/HttpServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/IllegalArgumentException.php
- copied, changed from r1186446, shindig/trunk/php/src/common/IllegalArgumentException.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Locale.php
- copied, changed from r1186446, shindig/trunk/php/src/common/Locale.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OAuthLookupService.php
- copied, changed from r1186446, shindig/trunk/php/src/common/OAuthLookupService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OpenSocialVersion.php
- copied, changed from r1186446, shindig/trunk/php/src/common/OpenSocialVersion.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Options.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContent.php
- copied, changed from r1186446, shindig/trunk/php/src/common/RemoteContent.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentFetcher.php
- copied, changed from r1186446, shindig/trunk/php/src/common/RemoteContentFetcher.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentRequest.php
- copied, changed from r1186470, shindig/trunk/php/src/common/RemoteContentRequest.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RequestTime.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityToken.php
- copied, changed from r1186446, shindig/trunk/php/src/common/SecurityToken.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityTokenDecoder.php
- copied, changed from r1186446, shindig/trunk/php/src/common/SecurityTokenDecoder.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuth.php
- copied, changed from r1186446, shindig/trunk/php/src/common/ShindigOAuth.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthNoDataException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthProblemException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthProtocolException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthRequest.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthUtil.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigRsaSha1SignatureMethod.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/XmlError.php
- copied, changed from r1186446, shindig/trunk/php/src/common/XmlError.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/BasicBlobCrypter.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/BasicBlobCrypter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/BasicOAuthDataStore.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/BasicOAuthDataStore.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/BasicOAuthLookupService.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/BasicOAuthLookupService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/BasicRemoteContent.php
- copied, changed from r1186470, shindig/trunk/php/src/common/sample/BasicRemoteContent.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/BasicRemoteContentFetcher.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/BasicRemoteContentFetcher.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/BasicSecurityToken.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/BasicSecurityToken.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/BasicSecurityTokenDecoder.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/BasicSecurityTokenDecoder.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/BlobExpiredException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/CacheStorageApc.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/CacheStorageApc.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/CacheStorageFile.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/CacheStorageFile.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/CacheStorageMemcache.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/CacheStorageMemcache.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/Crypto.php
- copied, changed from r1186446, shindig/trunk/php/src/common/sample/Crypto.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/sample/GeneralSecurityException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/ContainerConfig.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/ContainerConfig.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/Gadget.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/Gadget.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/GadgetBlacklist.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/GadgetBlacklist.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/GadgetContext.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/GadgetContext.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/GadgetException.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/GadgetException.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/GadgetFactory.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/GadgetFactory.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/GadgetFeatureRegistry.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/GadgetFeatureRegistry.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/GadgetSpec.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/GadgetSpec.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/GadgetSpecException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/GadgetSpecParser.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/GadgetSpecParser.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/MakeRequest.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/MakeRequest.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/MakeRequestHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/MakeRequestHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/MakeRequestOptions.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/MakeRequestOptions.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/MakeRequestParameterException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/MetadataGadgetContext.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/MetadataContext.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/MetadataHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/MetadataHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/ProxyBase.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/ProxyBase.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/ProxyHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/ProxyHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/SigningFetcher.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/SigningFetcher.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/SigningFetcherFactory.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/SigningFetcherFactory.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/Substitutions.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/Substitutions.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/AccesorInfo.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/BasicGadgetOAuthTokenStore.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/oauth/BasicGadgetOAuthTokenStore.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/BasicOAuthStore.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/oauth/BasicOAuthStore.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/ConsumerKeyAndSecret.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/Endpoint.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/GadgetInfo.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/oauth/GadgetOAuthTokenStore.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/Location.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/Method.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuth2Fetcher.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/oauth/OAuth2Fetcher.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthAccessor.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/oauth/OAuthAccessor.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthCallbackState.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/oauth/OAuthCallbackState.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthError.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/oauth/OAuthError.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthFetcher.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/oauth/OAuthFetcher.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthFetcherFactory.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/oauth/OAuthFetcherFactory.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthRequestParams.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/oauth/OAuthRequestParams.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthService.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/oauth/OAuthService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthServiceProvider.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/oauth/OAuthServiceProvider.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthSpec.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/oauth/OAuthSpec.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthStore.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/oauth/OAuthStore.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthStoreException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/OAuthStoreVars.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/ProviderInfo.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/ProviderKey.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/SpecParserException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/TokenInfo.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/oauth/TokenKey.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/render/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/render/EmptyClass.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/render/GadgetBaseRenderer.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/render/GadgetBaseRenderer.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/render/GadgetHrefRenderer.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/render/GadgetHrefRenderer.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/render/GadgetHtmlRenderer.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/render/GadgetHtmlRenderer.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/render/GadgetRenderer.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/render/GadgetRenderer.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/render/GadgetUrlRenderer.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/render/GadgetUrlRenderer.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/rewrite/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/rewrite/ContentRewriter.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/rewrite/ContentRewriter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/rewrite/DomRewriter.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/rewrite/DomRewriter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/rewrite/GadgetRewriter.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/rewrite/GadgetRewriter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/rewrite/SanitizeRewriter.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/rewrite/SanitizeRewriter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/sample/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/sample/BasicGadgetBlacklist.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/sample/BasicGadgetBlacklist.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/sample/BasicGadgetSpecFactory.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/sample/BasicGadgetSpecFactory.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/CertServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/servlet/CertServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/ContentFilesServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/servlet/ContentFilesServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/FilesServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/servlet/FilesServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/GadgetRenderingServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/servlet/GadgetRenderingServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/JsServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/servlet/JsServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/MakeRequestServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/servlet/MakeRequestServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/MetadataServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/servlet/MetadataServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/OAuthCallbackServlet.php
- copied, changed from r1186470, shindig/trunk/php/src/gadgets/servlet/OAuthCallbackServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/ProxyServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/servlet/ProxyServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/servlet/ResourcesFilesServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/servlet/ResourcesFilesServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/DataPipelining.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/templates/DataPipelining.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/ExpLexer.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/templates/ExpLexer.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/ExpLexerException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/ExpParser.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/templates/ExpParser.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/ExpParserException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/ExpType.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/templates/ExpType.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/ExpTypeException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/ExpressionException.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/ExpressionParser.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/templates/ExpressionParser.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/PrimitiveExp.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/SwfConfig.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/TemplateLibrary.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/templates/TemplateLibrary.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/TemplateLibraryContent.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/TemplateLibraryEntry.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/TemplateParser.php
- copied, changed from r1186446, shindig/trunk/php/src/gadgets/templates/TemplateParser.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/gadgets/templates/Token.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/InputActivitiesConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/InputActivitiesConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/InputAlbumsConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/InputAlbumsConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/InputAppDataConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/InputAppDataConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/InputBasicXmlConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/InputBasicXmlConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/InputConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/InputConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/InputInvalidateConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/InputInvalidateConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/InputMediaItemsConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/InputMediaItemsConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/InputMessagesConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/InputMessagesConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/InputPeopleConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/InputPeopleConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/OutputAtomConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/OutputAtomConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/OutputBasicXmlConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/OutputBasicXmlConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/OutputConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/OutputConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/OutputJsonConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/OutputJsonConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/converters/OutputXmlConverter.php
- copied, changed from r1186446, shindig/trunk/php/src/social/converters/OutputXmlConverter.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Account.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Account.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Activity.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Activity.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Address.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Address.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Album.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Album.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/ApiCollection.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/ApiCollection.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/BodyType.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/BodyType.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/ComplexField.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/ComplexField.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Email.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Email.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Enum.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Enum.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/EnumDrinker.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/EnumGender.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/EnumLookingFor.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/EnumPresence.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/EnumSmoker.php (with props)
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/IdSpec.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/IdSpec.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Im.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Im.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/ListField.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/ListField.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/MediaItem.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/MediaItem.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Message.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Message.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/MessageCollection.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/MessageCollection.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Name.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Name.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Organization.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Organization.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Person.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Person.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Phone.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Phone.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Photo.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Photo.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/model/Url.php
- copied, changed from r1186446, shindig/trunk/php/src/social/model/Url.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/oauth/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/oauth/OAuthSecurityToken.php
- copied, changed from r1186446, shindig/trunk/php/src/social/oauth/OAuthSecurityToken.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/sample/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/sample/DefaultInvalidateService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/sample/DefaultInvalidateService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/sample/JsonDbOpensocialService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/sample/JsonDbOpensocialService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/ActivityHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/ActivityHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/AlbumHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/AlbumHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/AppDataHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/AppDataHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/DataRequestHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/DataRequestHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/GroupHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/GroupHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/HandlerPreconditions.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/HandlerPreconditions.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/HttpHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/HttpHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/InvalidateHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/InvalidateHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/MediaItemHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/MediaItemHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/MessagesHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/MessagesHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/PersonHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/PersonHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/RequestItem.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/RequestItem.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/ResponseError.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/ResponseError.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/ResponseItem.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/ResponseItem.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/RestRequestItem.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/RestRequestItem.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/RpcRequestItem.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/RpcRequestItem.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/SocialSpiException.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/SocialSpiException.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/service/SystemHandler.php
- copied, changed from r1186446, shindig/trunk/php/src/social/service/SystemHandler.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/servlet/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/servlet/ApiServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/social/servlet/ApiServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/servlet/CompatibilityJsonRpcServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/social/servlet/CompatibilityJsonRpcServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/servlet/DataServiceServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/social/servlet/DataServiceServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/servlet/JsonRpcServlet.php
- copied, changed from r1186446, shindig/trunk/php/src/social/servlet/JsonRpcServlet.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/ActivityService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/ActivityService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/AlbumService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/AlbumService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/AppDataService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/AppDataService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/CollectionOptions.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/CollectionOptions.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/DataCollection.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/DataCollection.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/GroupId.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/GroupId.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/GroupService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/GroupService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/InvalidateService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/InvalidateService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/MediaItemService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/MediaItemService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/MessagesService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/MessagesService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/PersonService.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/PersonService.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/RestfulCollection.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/RestfulCollection.php
shindig/branches/php_namespace_refactoring/php/src/apache/shindig/social/spi/UserId.php
- copied, changed from r1186446, shindig/trunk/php/src/social/spi/UserId.php
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/FrontController.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/FrontController.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/FrontController.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/FrontController.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,103 @@
+<?php
+namespace apache\shindig;
+
+use apache\shindig\common\Config;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+class FrontController {
+
+ public function run() {
+ $this->checkServerConfig();
+
+ //get servlet map and prefix the servlet paths
+ $configServletMap = Config::get('servlet_map');
+ $webPrefix = Config::get('web_prefix');
+ $servletMap = array();
+ foreach ($configServletMap as $path => $servlet) {
+ $servletMap[$webPrefix . $path] = $servlet;
+ }
+
+ // Try to match the request url to our servlet mapping
+ $servlet = false;
+ $uri = $_SERVER["REQUEST_URI"];
+ foreach ($servletMap as $url => $class) {
+ if (substr($uri, 0, strlen($url)) == $url) {
+ //FIXME temporary hack to support both /proxy and /makeRequest with the same event handler
+ // /makeRequest == /proxy?output=js
+ if ($url == $webPrefix . '/gadgets/makeRequest') {
+ $_GET['output'] = 'js';
+ }
+ $servlet = $class;
+ break;
+ }
+ }
+
+ // If we found a correlating servlet, instance and call it. Otherwise give a 404 error
+ if ($servlet) {
+ $class = new $class();
+ $method = $_SERVER['REQUEST_METHOD'];
+ // Not all clients support the PUT, HEAD & DELETE http methods, they depend on the X-HTTP-Method-Override instead
+ if ($method == 'POST' && isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+ }
+ $method = 'do' . ucfirst(strtolower($method));
+ if (is_callable(array($class, $method))) {
+ $class->$method();
+ } else {
+ header("HTTP/1.0 405 Method Not Allowed");
+ echo "<html><body><h1>405 Method Not Allowed</h1></body></html>";
+ }
+ } else {
+ // Unhandled event, display simple 404 error
+ header("HTTP/1.0 404 Not Found");
+ echo "<html><body><h1>404 Not Found</h1></body></html>";
+ }
+ }
+
+ private function checkServerConfig() {
+ if (!Config::get('debug')) {
+ // Basic sanity check if we have all required modules
+ $modules = array('json', 'SimpleXML', 'libxml', 'curl', 'openssl');
+ // if plain text tokens are disallowed we require mcrypt
+ if (!Config::get('allow_plaintext_token')) {
+ $modules[] = 'mcrypt';
+ }
+ // if you selected the memcache caching backend, you need the memcache extention too :)
+ if (Config::get('data_cache') == 'CacheMemcache') {
+ $modules[] = 'memcache';
+ }
+ foreach ($modules as $module) {
+ if (!extension_loaded($module)) {
+ die("Shindig requires the {$module} extention, see <a href='http://www.php.net/{$module}'>http://www.php.net/{$module}</a> for more info");
+ }
+ }
+
+ if (get_magic_quotes_gpc()) {
+ die("Your environment has magic_quotes_gpc enabled which will interfere with Shindig. Please set 'magic_quotes_gpc' to 'Off' in php.ini");
+ }
+
+ $populate_raw_post = strtolower(ini_get("always_populate_raw_post_data"));
+ if (!isset($populate_raw_post) || $populate_raw_post === "0" || $populate_raw_post === "Off") {
+ die("Your environment does not have always_populate_raw_post_data enabled which will interfere with Shindig. Please set 'always_populate_raw_post_data' to 'On' in php.ini");
+ }
+ }
+ }
+
+}
\ No newline at end of file
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/FrontController.php
------------------------------------------------------------------------------
svn:keywords = Id
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/bootstrap.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/bootstrap.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/bootstrap.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/bootstrap.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,66 @@
+<?php
+namespace apache\shindig;
+
+use apache\shindig\common\Config;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Some people forget to set their timezone in their php.ini,
+// this prevents that from generating warnings
+@date_default_timezone_set(@date_default_timezone_get());
+
+require_once __DIR__ . '/../../../external/Symfony/Component/ClassLoader/UniversalClassLoader.php';
+
+$loader = new \Symfony\Component\ClassLoader\UniversalClassLoader();
+$loader->registerNamespaces(array(
+ 'Symfony' => __DIR__ . '/../../../external',
+ 'apache\shindig' => __DIR__ . '/../../'
+
+));
+$loader->registerPrefixes(array(
+ 'Zend_' => __DIR__ . '/../../../external',
+));
+$loader->register();
+
+
+$mapperLoader = new \Symfony\Component\ClassLoader\MapClassLoader(array(
+ 'JsMin' => __DIR__ . '/../../../external/jsmin-php/jsmin.php',
+ 'OAuthRequest' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthSignatureMethod_RSA_SHA1' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthSignatureMethod_PLAINTEXT' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthSignatureMethod_HMAC_SHA1' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthSignatureMethodRSA_SHA1' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthUtil' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthToken' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthConsumer' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthDataStore' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthException' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+ 'OAuthServer' => __DIR__ . '/../../../external/OAuth/OAuth.php',
+));
+
+$mapperLoader->register();
+
+$extensionClassPaths = \apache\shindig\common\Config::get('extension_class_paths');
+
+if (! is_array($extensionClassPaths)) {
+ $extensionClassPaths = array($extensionClassPaths);
+}
+
+$loader->registerPrefixFallbacks($extensionClassPaths);
\ No newline at end of file
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/bootstrap.php
------------------------------------------------------------------------------
svn:keywords = Id
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/AuthenticationMode.php (from r1186446, shindig/trunk/php/src/common/AuthenticationMode.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/AuthenticationMode.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/AuthenticationMode.php&p1=shindig/trunk/php/src/common/AuthenticationMode.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/AuthenticationMode.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/AuthenticationMode.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypter.php (from r1186446, shindig/trunk/php/src/common/BlobCrypter.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypter.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypter.php&p1=shindig/trunk/php/src/common/BlobCrypter.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/BlobCrypter.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypter.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +20,6 @@
* under the License.
*/
-
-class BlobCrypterException extends Exception { }
-
/**
* Utility interface for managing signed, encrypted, and time stamped blobs.
* Blobs are made up of name/value pairs. Time stamps are automatically
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypterException.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypterException.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypterException.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypterException.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,27 @@
+<?php
+namespace apache\shindig\common;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+class BlobCrypterException extends \Exception {
+
+}
+
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/BlobCrypterException.php
------------------------------------------------------------------------------
svn:keywords = Id
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Cache.php (from r1186446, shindig/trunk/php/src/common/Cache.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Cache.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Cache.php&p1=shindig/trunk/php/src/common/Cache.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/Cache.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Cache.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,22 +20,12 @@
* under the License.
*/
-class CacheException extends Exception {
-}
-
-class RequestTime {
-
- public function getRequestTime() {
- return $_SERVER['REQUEST_TIME'];
- }
-}
-
class Cache {
/**
* @var RequestTime
*/
private $time = null;
-
+
/**
* @var CacheStorage
*/
@@ -130,7 +122,7 @@ class Cache {
try {
$this->storage->store($key, $data);
$this->storage->unlock($key);
- } catch (Exception $e) {
+ } catch (\Exception $e) {
$this->storage->unlock($key);
throw $e;
}
@@ -143,7 +135,7 @@ class Cache {
public function delete($key) {
if (! $this->storage) {
return false;
- }
+ }
if ($this->storage->isLocked($key)) {
$this->storage->waitForLock($key);
}
@@ -172,7 +164,7 @@ class Cache {
$this->storage->store($key, $data);
}
$this->storage->unlock($key);
- } catch (Exception $e) {
+ } catch (\Exception $e) {
$this->storage->unlock($key);
throw $e;
}
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheException.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheException.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheException.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheException.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,24 @@
+<?php
+namespace apache\shindig\common;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+class CacheException extends \Exception {
+}
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheException.php
------------------------------------------------------------------------------
svn:keywords = Id
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheStorage.php (from r1186446, shindig/trunk/php/src/common/CacheStorage.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheStorage.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheStorage.php&p1=shindig/trunk/php/src/common/CacheStorage.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/CacheStorage.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/CacheStorage.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Config.php (from r1186446, shindig/trunk/php/src/common/Config.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Config.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Config.php&p1=shindig/trunk/php/src/common/Config.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/Config.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Config.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,9 +20,6 @@
* under the License.
*/
-class ConfigException extends Exception {
-}
-
/**
* Configuration class. It uses the keys/values from config/container.php
* and (if the file exists) config/local.php.
@@ -41,10 +40,10 @@ class Config {
global $shindigConfig;
if (! self::$config) {
// load default configuration
- require realpath(dirname(__FILE__) . "/../../config") . '/container.php';
+ require realpath(dirname(__FILE__) . "/../../../../config") . '/container.php';
self::$config = $shindigConfig;
if ($local) {
- $localConfigPath = realpath(dirname(__FILE__) . "/../../config") . '/' . $local . '.php';
+ $localConfigPath = realpath(dirname(__FILE__) . "/../../../../config") . '/' . $local . '.php';
if (file_exists($localConfigPath)) {
// include local.php if it exists and merge the config arrays.
// the second array values overwrites the first one's
@@ -54,7 +53,7 @@ class Config {
}
}
}
-
+
/**
* Merges the given array with the config array. It uses the keys/values from config/container.php.
*
@@ -63,7 +62,7 @@ class Config {
static function setConfig($tconfig) {
if (!is_array(self::$config))
self::loadConfig();
-
+
self::$config = array_merge(self::$config, $tconfig);
}
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ConfigException.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ConfigException.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ConfigException.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ConfigException.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,24 @@
+<?php
+namespace apache\shindig\common;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+class ConfigException extends \Exception {
+}
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ConfigException.php
------------------------------------------------------------------------------
svn:keywords = Id
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/File.php (from r1186446, shindig/trunk/php/src/common/File.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/File.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/File.php&p1=shindig/trunk/php/src/common/File.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/File.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/File.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/HttpServlet.php (from r1186446, shindig/trunk/php/src/common/HttpServlet.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/HttpServlet.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/HttpServlet.php&p1=shindig/trunk/php/src/common/HttpServlet.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/HttpServlet.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/HttpServlet.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/IllegalArgumentException.php (from r1186446, shindig/trunk/php/src/common/IllegalArgumentException.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/IllegalArgumentException.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/IllegalArgumentException.php&p1=shindig/trunk/php/src/common/IllegalArgumentException.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/IllegalArgumentException.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/IllegalArgumentException.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,5 +21,5 @@
*/
-class IllegalArgumentException extends Exception {
+class IllegalArgumentException extends \Exception {
}
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Locale.php (from r1186446, shindig/trunk/php/src/common/Locale.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Locale.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Locale.php&p1=shindig/trunk/php/src/common/Locale.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/Locale.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Locale.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OAuthLookupService.php (from r1186446, shindig/trunk/php/src/common/OAuthLookupService.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OAuthLookupService.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OAuthLookupService.php&p1=shindig/trunk/php/src/common/OAuthLookupService.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/OAuthLookupService.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OAuthLookupService.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OpenSocialVersion.php (from r1186446, shindig/trunk/php/src/common/OpenSocialVersion.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OpenSocialVersion.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OpenSocialVersion.php&p1=shindig/trunk/php/src/common/OpenSocialVersion.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/OpenSocialVersion.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/OpenSocialVersion.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Options.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Options.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Options.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Options.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,46 @@
+<?php
+namespace apache\shindig\common;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Bag of options for making a request.
+ *
+ * This object is mutable to keep us sane. Don't mess with it once you've
+ * sent it to RemoteContentRequest or bad things might happen.
+ */
+class Options {
+ public $ignoreCache = false;
+ public $ownerSigned = true;
+ public $viewerSigned = true;
+
+ public function __construct() {}
+
+ /**
+ * Copy constructor
+ *
+ * @param Options $copyFrom
+ */
+ public function copyOptions(Options $copyFrom) {
+ $this->ignoreCache = $copyFrom->ignoreCache;
+ $this->ownerSigned = $copyFrom->ownerSigned;
+ $this->viewerSigned = $copyFrom->viewerSigned;
+ }
+}
\ No newline at end of file
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/Options.php
------------------------------------------------------------------------------
svn:keywords = Id
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContent.php (from r1186446, shindig/trunk/php/src/common/RemoteContent.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContent.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContent.php&p1=shindig/trunk/php/src/common/RemoteContent.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/RemoteContent.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContent.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,10 +28,6 @@
* So a different methodlogy which calls for a different working unfortunatly, however
* it's kept in the spirit of the java variant as much as possible
*/
-
-class RemoteContentException extends Exception {
-}
-
abstract class RemoteContent {
/**
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentException.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentException.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentException.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentException.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,24 @@
+<?php
+namespace apache\shindig\common;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+class RemoteContentException extends \Exception {
+}
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentException.php
------------------------------------------------------------------------------
svn:keywords = Id
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentFetcher.php (from r1186446, shindig/trunk/php/src/common/RemoteContentFetcher.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentFetcher.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentFetcher.php&p1=shindig/trunk/php/src/common/RemoteContentFetcher.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/RemoteContentFetcher.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentFetcher.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentRequest.php (from r1186470, shindig/trunk/php/src/common/RemoteContentRequest.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentRequest.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentRequest.php&p1=shindig/trunk/php/src/common/RemoteContentRequest.php&r1=1186470&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/RemoteContentRequest.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RemoteContentRequest.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,7 @@
<?php
+namespace apache\shindig\common;
+use apache\shindig\gadgets\oauth\OAuthRequestParams;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -406,29 +409,3 @@ class RemoteContentRequest {
return $url;
}
}
-
-
-/**
- * Bag of options for making a request.
- *
- * This object is mutable to keep us sane. Don't mess with it once you've
- * sent it to RemoteContentRequest or bad things might happen.
- */
-class Options {
- public $ignoreCache = false;
- public $ownerSigned = true;
- public $viewerSigned = true;
-
- public function __construct() {}
-
- /**
- * Copy constructor
- *
- * @param Options $copyFrom
- */
- public function copyOptions(Options $copyFrom) {
- $this->ignoreCache = $copyFrom->ignoreCache;
- $this->ownerSigned = $copyFrom->ownerSigned;
- $this->viewerSigned = $copyFrom->viewerSigned;
- }
-}
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RequestTime.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RequestTime.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RequestTime.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RequestTime.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,28 @@
+<?php
+namespace apache\shindig\common;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+class RequestTime {
+
+ public function getRequestTime() {
+ return $_SERVER['REQUEST_TIME'];
+ }
+}
\ No newline at end of file
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/RequestTime.php
------------------------------------------------------------------------------
svn:keywords = Id
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityToken.php (from r1186446, shindig/trunk/php/src/common/SecurityToken.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityToken.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityToken.php&p1=shindig/trunk/php/src/common/SecurityToken.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/SecurityToken.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityToken.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityTokenDecoder.php (from r1186446, shindig/trunk/php/src/common/SecurityTokenDecoder.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityTokenDecoder.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityTokenDecoder.php&p1=shindig/trunk/php/src/common/SecurityTokenDecoder.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/SecurityTokenDecoder.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/SecurityTokenDecoder.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Copied: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuth.php (from r1186446, shindig/trunk/php/src/common/ShindigOAuth.php)
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuth.php?p2=shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuth.php&p1=shindig/trunk/php/src/common/ShindigOAuth.php&r1=1186446&r2=1190083&rev=1190083&view=diff
==============================================================================
--- shindig/trunk/php/src/common/ShindigOAuth.php (original)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuth.php Thu Oct 27 23:20:41 2011
@@ -1,4 +1,6 @@
<?php
+namespace apache\shindig\common;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,33 +20,6 @@
* under the License.
*/
-require_once 'external/OAuth/OAuth.php';
-
-class ShindigOAuthProblemException extends Exception {}
-
-class ShindigOAuthProtocolException extends Exception {}
-
-class ShindigOAuthNoDataException extends Exception {}
-
-class ShindigRsaSha1SignatureMethod extends OAuthSignatureMethod_RSA_SHA1 {
- private $privateKey;
- private $publicKey;
-
- public function __construct($privateKey, $publicKey) {
- $this->privateKey = $privateKey;
- $this->publicKey = $publicKey;
- }
-
- protected function fetch_public_cert(&$request) {
- return $this->publicKey;
- }
-
- protected function fetch_private_cert(&$request) {
- return $this->privateKey;
- }
-}
-
-
class ShindigOAuth {
public static $VERSION_1_0 = "1.0";
public static $ENCODING = "UTF-8";
@@ -64,200 +39,3 @@ class ShindigOAuth {
public static $END_PRIVATE_KEY = "-----END PRIVATE KEY-----";
public static $OAUTH_PROBLEM = "oauth_problem";
}
-
-class ShindigOAuthRequest extends OAuthRequest {
- /**
- * Needed so that OAuthFetcher works with the correct type of requests.
- *
- * @param OAuthRequest $request
- */
- public function __construct(OAuthRequest $request) {
- $this->parameters = $request->parameters;
- $this->http_url = $request->http_url;
- $this->http_method = $request->http_method;
- }
-
- /**
- * Needed so that OAuthFetcher works with the correct type of requests.
- * @return ShindigOAuthRequest
- */
- public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
- return new ShindigOAuthRequest(OAuthRequest::from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters));
- }
-
- /**
- * Needed so that OAuthFetcher works with the correct type of requests.
- * @return ShindigOAuthRequest
- */
- public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {
- return new ShindigOAuthRequest(OAuthRequest::from_request($http_method, $http_url, $parameters));
- }
-
- /**
- * Needed in OAuthFetcher.php
- *
- * @param array $params
- * @return array
- */
- public function set_parameters($params) {
- return $this->parameters = $params;
- }
-
- /**
- * Needed in OAuthFetcher.php
- *
- * @param array $names
- */
- public function requireParameters($names) {
- $present = $this->parameters;
- $absent = array();
- foreach ($names as $required) {
- if (! in_array($required, $present)) {
- $absent[] = $required;
- }
- }
- if (count($absent) == 0) {
- throw new ShindigOAuthProblemException("oauth_parameters_absent: " . ShindigOAuthUtil::urlencodeRFC3986($absent));
- }
- }
-
- /**
- * Needed in OAuthFetcher.php
- *
- * @return string
- */
- public function get_url() {
- return $this->http_url;
- }
-
- /**
- * Needed in SigningFetcher.php
- *
- * @return string
- */
- public static function generate_nonce() {
- $mt = microtime();
- $rand = mt_rand();
- return md5($mt . $rand); // md5s look nicer than numbers
- }
-
- /**
- * Needed for from_consumer_and_token
- *
- * @return int
- */
- private static function generate_timestamp() {
- return time();
- }
-}
-
-class ShindigOAuthUtil extends OAuthUtil {
- public static $AUTH_SCHEME = "OAuth";
- private static $AUTHORIZATION = "\ *[a-zA-Z0-9*]\ +(.*)";
- private static $NVP = "(\\S*)\\s*\\=\\s*\"([^\"]*)\"";
-
-
- /**
- * Needed in OAuthFetcher.php
- *
- * @param array $params
- * @return string
- */
- public static function getPostBodyString(Array $params) {
- $result = '';
- $first = true;
- foreach ($params as $key => $val) {
- if ($first) {
- $first = false;
- } else {
- $result .= '&';
- }
- $result .= ShindigOAuthUtil::urlencode_rfc3986($key) . "=" . ShindigOAuthUtil::urlencode_rfc3986($val);
- }
- return $result;
- }
-
- /**
- * Needed in OAuthFetcher.php
- * Return true if the given Content-Type header means FORM_ENCODED.
- *
- * @param string $contentType
- * @return boolean
- */
- public static function isFormEncoded($contentType) {
- if (! isset($contentType)) {
- return false;
- }
- $semi = strpos($contentType, ";");
- if ($semi != false) {
- $contentType = substr($contentType, 0, $semi);
- }
- return strtolower(ShindigOAuth::$FORM_ENCODED) == strtolower(trim($contentType));
- }
-
- /**
- * Needed in OAuthFetcher.php
- *
- * @param string $url
- * @param array $oauthParams
- * @return string
- */
- public static function addParameters($url, $oauthParams) {
- $url .= strchr($url, '?') === false ? '?' : '&';
- foreach ($oauthParams as $key => $value) {
- $url .= ShindigOAuthUtil::urlencode_rfc3986($key)."=".ShindigOAuthUtil::urlencode_rfc3986($value)."&";
- }
- return $url;
- }
-
- /**
- * Needed in OAuthFetcher.php
- *
- * @param string $form
- * @return array
- */
- public static function decodeForm($form) {
- $parameters = array();
- $explodedForm = explode("&", $form);
- foreach ($explodedForm as $params) {
- $value = explode("=", $params);
- if (! empty($value[0]) && ! empty($value[1])) {
- $parameters[ShindigOAuthUtil::urldecode_rfc3986($value[0])] = ShindigOAuthUtil::urldecode_rfc3986($value[1]);
- }
- }
- return $parameters;
- }
-
- /**
- * Needed in OAuthFetcher.php
- *
- * Parse the parameters from an OAuth Authorization or WWW-Authenticate
- * header. The realm is included as a parameter. If the given header doesn't
- * start with "OAuth ", return an empty list.
- *
- * @param string $authorization
- * @return array
- */
- public static function decodeAuthorization($authorization) {
- $into = array();
- if ($authorization != null) {
- $m = ereg(ShindigOAuthUtil::$AUTHORIZATION, $authorization);
- if ($m !== false) {
- if (strpos($authorization, ShindigOAuthUtil::$AUTH_SCHEME) == 0) {
- $authorization = str_replace("OAuth ", "", $authorization);
- $authParams = explode(", ", $authorization);
- foreach ($authParams as $params) {
- $m = ereg(ShindigOAuthUtil::$NVP, $params);
- if ($m == 1) {
- $keyValue = explode("=", $params);
- $name = ShindigOAuthUtil::urlencode_rfc3986($keyValue[0]);
- $value = ShindigOAuthUtil::urlencode_rfc3986(str_replace("\"", "", $keyValue[1]));
- $into[$name] = $value;
- }
- }
- }
- }
- }
- return $into;
- }
-}
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthNoDataException.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthNoDataException.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthNoDataException.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthNoDataException.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,23 @@
+<?php
+namespace apache\shindig\common;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+class ShindigOAuthNoDataException extends \Exception {}
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthNoDataException.php
------------------------------------------------------------------------------
svn:keywords = Id
Added: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthProblemException.php
URL: http://svn.apache.org/viewvc/shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthProblemException.php?rev=1190083&view=auto
==============================================================================
--- shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthProblemException.php (added)
+++ shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthProblemException.php Thu Oct 27 23:20:41 2011
@@ -0,0 +1,23 @@
+<?php
+namespace apache\shindig\common;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+class ShindigOAuthProblemException extends \Exception {}
Propchange: shindig/branches/php_namespace_refactoring/php/src/apache/shindig/common/ShindigOAuthProblemException.php
------------------------------------------------------------------------------
svn:keywords = Id