You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by rb...@apache.org on 2011/10/14 22:35:23 UTC
svn commit: r1183491 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/logging/i18n/
common/src/main/java/org/apache/shindig/common/xml/
common/src/main/java/org/apache/shindig/protocol/
common/src/main/resources/org/apache/shind...
Author: rbaxter85
Date: Fri Oct 14 20:35:22 2011
New Revision: 1183491
URL: http://svn.apache.org/viewvc?rev=1183491&view=rev
Log:
SHINDIG-1638
Committed For Michael Beaver
Improvements to shindig log messages
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties
shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java?rev=1183491&r1=1183490&r2=1183491&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/logging/i18n/MessageKeys.java Fri Oct 14 20:35:22 2011
@@ -29,7 +29,8 @@ public interface MessageKeys {
public static final String ERROR_PARSING_SECURE_TOKEN = "errorParsingSecureToken";
//XmlUtil
public static final String ERROR_PARSING_XML="commonErrorParsingXML";
- public static final String ERROR_PARSING_EXTERNAL_ENTITIES="errorParsingExternalEntities";
+ public static final String ERROR_PARSING_EXTERNAL_GENERAL_ENTITIES="errorParsingExternalGeneralEntities";
+ public static final String ERROR_PARSING_EXTERNAL_PARAMETER_ENTITIES="errorParsingExternalParameterEntities";
public static final String ERROR_PARSING_EXTERNAL_DTD="errorParsingExternalDTD";
public static final String ERROR_PARSING_SECURE_XML="errorNotUsingSecureXML";
public static final String REUSE_DOC_BUILDERS="reuseDocumentBuilders";
@@ -44,7 +45,7 @@ public interface MessageKeys {
public static final String LOAD_RESOURCES_FROM="loadResourcesFrom";
public static final String LOAD_FILES_FROM="loadFilesFrom";
//ApiServlet
- public static final String API_SERVLET_PROTOCAL_EXCEPTION="apiServletProtocalException";
+ public static final String API_SERVLET_PROTOCOL_EXCEPTION="apiServletProtocolException";
public static final String API_SERVLET_EXCEPTION="apiServletException";
//RegistryFeature
public static final String OVERRIDING_FEATURE="overridingFeature";
@@ -55,7 +56,7 @@ public interface MessageKeys {
//FeatureResourceLoader
public static final String MISSING_FILE="missingFile";
- public static final String UNABLE_RETRIVE_LIB="unableRetriveLib";
+ public static final String UNABLE_RETRIEVE_LIB="unableRetrieveLib";
//BasicHttpFetcher
public static final String TIMEOUT_EXCEPTION="timeoutException";
public static final String EXCEPTION_OCCURRED="exceptionOccurred";
@@ -140,7 +141,7 @@ public interface MessageKeys {
public static final String UPDATE_SPEC_FAILURE_USE_CACHE_VERSION="updateSpecFailureUseCacheVersion";
public static final String UPDATE_SPEC_FAILURE_APPLY_NEG_CACHE="updateSpecFailureApplyNegCache";
//HashLockedDomainService
- public static final String NO_LOCKED_DOMAIN_CONFIG="noLocakedDomainConfig";
+ public static final String NO_LOCKED_DOMAIN_CONFIG="noLockedDomainConfig";
//Bootstrap
public static final String STARTING_CONN_MANAGER_WITH="startingConnManagerWith";
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java?rev=1183491&r1=1183490&r2=1183491&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java Fri Oct 14 20:35:22 2011
@@ -95,7 +95,7 @@ public final class XmlUtil {
} catch (IllegalArgumentException e) {
// Not supported by some very old parsers.
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, CLASSNAME, "static block", MessageKeys.ERROR_PARSING_EXTERNAL_ENTITIES);
+ LOG.logp(Level.INFO, CLASSNAME, "static block", MessageKeys.ERROR_PARSING_EXTERNAL_GENERAL_ENTITIES);
}
}
@@ -105,7 +105,7 @@ public final class XmlUtil {
} catch (IllegalArgumentException e) {
// Not supported by some very old parsers.
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, CLASSNAME, "static block", MessageKeys.ERROR_PARSING_EXTERNAL_ENTITIES);
+ LOG.logp(Level.INFO, CLASSNAME, "static block", MessageKeys.ERROR_PARSING_EXTERNAL_PARAMETER_ENTITIES);
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java?rev=1183491&r1=1183490&r2=1183491&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ApiServlet.java Fri Oct 14 20:35:22 2011
@@ -141,7 +141,7 @@ public abstract class ApiServlet extends
if (t instanceof ProtocolException) {
ProtocolException pe = (ProtocolException) t;
if (LOG.isLoggable(Level.INFO)) {
- LOG.logp(Level.INFO, classname, "responseItemFromException", MessageKeys.API_SERVLET_PROTOCAL_EXCEPTION,pe);
+ LOG.logp(Level.INFO, classname, "responseItemFromException", MessageKeys.API_SERVLET_PROTOCOL_EXCEPTION,pe);
}
return new ResponseItem(pe.getCode(), pe.getMessage(), pe.getResponse());
}
Modified: shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties?rev=1183491&r1=1183490&r2=1183491&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties (original)
+++ shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource.properties Fri Oct 14 20:35:22 2011
@@ -17,156 +17,157 @@
##AuthenticationServletFilter
-errorParsingSecureToken=The input secure token or credential is malform and can not be parsed.
+errorParsingSecureToken=The security token or credential is malformed and cannot be parsed.
##XmlUtil
errorParsingXML=Error parsing the XML. This can be ignored.
-errorParsingExternalEntities=XML parsers will load external general entities.
-errorParsingExternalDTD=XML parsers will load external DTDs.
-errorNotUsingSecureXML=Not using secure XML processing.
-reuseDocumentBuilders=Reusing document builders.
-notReuseDocBuilders=Not reusing document builders.
+errorParsingExternalGeneralEntities=The XML processor being used will load external general entities.
+errorParsingExternalParameterEntities=The XML processor being used will load external parameter entities.
+errorParsingExternalDTD=The XML processor being used will load Document Type Definitions (DTD).
+errorNotUsingSecureXML=The XML processor being used does not support secure parsing.
+reuseDocumentBuilders=Document builders are being reused.
+notReuseDocBuilders=Document builders are not being reused.
##LruCacheProvider
-LRUCapacity={0} LRU capacity configured for {1}.
+LRUCapacity=The least recently used (LRU) capacity {0} is configured for {1}.
##DynamicConfigProperty
-evalExpressionFailed=Evaluation of {0} failed.
+evalExpressionFailed={0} cannot be evaluated.
##JsonContainerConfigLoader
-readingContainerConfig=Reading container config: {0}.
-loadFromString=Trouble parsing {0}.
+readingContainerConfig=Container configuration {0} is being read.
+loadFromString={0} cannot be parsed.
##JsonContainerConfigLoader, FeatureRegistry
-loadResourcesFrom=Loading resources from {0}.
+loadResourcesFrom=Resources from {0} are loading.
##JsonContainerConfigLoader, FeatureRegistry
-loadFilesFrom=Loading files from{0}
+loadFilesFrom=Files from {0} are loading.
##ApiServlet
-apiServletProtocalException=Returning a response error as result of a protocol exception.
-apiServletException=Returning a response error as result of a protocol exception.
+apiServletProtocolException=A response error is being returned because a protocol exception occurred.
+apiServletException=A response error is being returned because a protocol exception occurred.occurred.
##FeatureRegistry
-overridingFeature=Overriding feature: {0} with definition at: {1}
+overridingFeature=The {0} feature with definition at {1} is being overridden.
##FeatureResourceLoader
-missingFile=File existed before but is now missing! Name: {0}
-unableRetriveLib=Unable to retrieve remote library from: {0}
+missingFile=The file {0} used to exist but is now missing.
+unableRetrieveLib=The remote library from {0} cannot be retrieved.
##BasicHttpFetcher
-timeoutException=Timeout for {0} Exception: {1} - {2} - {3} ms
-exceptionOccurred=Got Exception fetching {0} - {1} ms
-slowResponse=Slow response from {0} {1} ms
+timeoutException={0} has timed out because of the following exception: {1} - {2} - {3} ms.
+exceptionOccurred=The following exception occurred when fetching {0}: {1} ms elapsed.
+slowResponse={0} is responding slowly. {1} ms elapsed.
##HttpResponseMetadataHelper
-errorGettingMD5=Error getting MD5 digest, ignored
-errorParsingMD5=Error parsing MD5 string as UTF8
+errorGettingMD5=An error occurred when getting Message Digest 5 (MD5). The error was ignored.
+errorParsingMD5=An error occurred when parsing the Message Digest 5 (MD5) string in UTF-8 format.
##OAuthModule
-usingRandomKey=Using random key for OAuth client-side state encryption
-usingFile=Using file {0} for OAuth client-side state encryption
-loadKeyFileFrom=Loading OAuth signing key from {0}
-couldNotLoadKeyFile=Couldn't load key file {0}
-couldNotLoadSignedKey=Couldn''t load OAuth signing key. To create a key, run:\n openssl req -newkey rsa:1024 -days 365 -nodes -x509 -keyout testkey.pem \\\n -out testkey.pem -subj '/CN=mytestkey'\n openssl pkcs8 -in testkey.pem -out oauthkey.pem -topk8 -nocrypt -outform PEM\n\n Then edit shindig.properties and add these lines:\n {0} =<path-to-oauthkey.pem>\n {1} =mykey\n
-failedToInit=Failed to initialize OAuth consumers from {0}
+usingRandomKey=A random key for OAuth client-side state encryption is being used.
+usingFile=The {0} file for OAuth client-side state encryption is being used.
+loadKeyFileFrom=The OAuth signing key from {0} is loading.
+couldNotLoadKeyFile= The {0} key file could not be loaded.
+couldNotLoadSignedKey=The OAuth signing key did not load correctly. To create a key: \n 1. Run the following command: \n openssl req -newkey rsa:1024 -days 365 -nodes -x509 -keyout testkey.pem \\\n -out testkey.pem -subj '/CN=mytestkey'\n openssl pkcs8 -in testkey.pem -out oauthkey.pem -topk8 -nocrypt -outform PEM\n\n. 2. Edit the shindig.properties file by adding these lines: \n{0} =<path-to-oauthkey.pem>\n {1} =mykey\n.
+failedToInit=OAuth consumers from {0} failed to initialize.
##OAuthRequest
-oauthFetchFatalError=OAuth fetch fatal error \n {0}
-oauthFetchErrorReprompt=OAuth fetch error, reprompting for user approval \n {0}
-bogusExpired=server returned bogus expiration \n {0}
-oauthFetchUnexpectedError=OAuth fetch unexpected fatal error \n {0}
-unauthenticatedOauth=Unauthenticated OAuth fetch \n {0}
-invalidOauth=Invalid OAuth fetch request \n {0}
+oauthFetchFatalError=The following fatal error occurred when OAuth was fetching content: \n {0}.
+oauthFetchErrorReprompt=The following error occurred when OAuth was fetching content: \n {0}. The user is being reprompted for approval.
+bogusExpired=The server returned an invalid expiration:\n {0}.
+oauthFetchUnexpectedError=The following fatal error occurred when OAuth was fetching content: \n {0}.
+unauthenticatedOauth=OAuth cannot fetch content because the user authentication does not exist. The following error occurred: \n {0}.
+invalidOauth=OAuth cannot fetch content because the request is invalid. The following error occurred: \n {0}.
##CajaCssSanitizer
-failedToParse=Failed to parse stylesheet
-unableToConvertScript=Unable to convert script node to an osml tag
+failedToParse=The style sheet cannot be parsed.
+unableToConvertScript=The script node cannot be converted to an OpenSocial Markup Language (OSML) tag.
##PipelineExecutor
-errorPreloading=Unexpected error when preloading
+errorPreloading=An unexpected error occurred when preloading.
##Processor
-renderNonWhitelistedGadget=Attempted to render a gadget not on the whitelist: {0}
+renderBlacklistedGadget=The system attempted to render the following blacklisted gadget: {0}.
##CajaResponseRewriter, CajaContentRewriter
-failedToRetrieve=Failed to retrieve {0}
-failedToRead=Failed to read {0}
+failedToRetrieve={0} cannot be retrieved.
+failedToRead={0} cannot be read.
##DefaultServiceFetcher
-httpErrorFetching=HTTP Error {0} fetching service methods from endpoint {1}
-failedToFetchService=Failed to fetch services methods from endpoint {0}. Error {1}
-failedToParseService=Failed to parse services methods from endpoint {0} {1}
+httpErrorFetching=An HTTP {0} error occurred when fetching service methods from the {1} endpoint.
+failedToFetchService=Services methods from the {0} endpoint could not be fetched. The following error occurred: {1}.
+failedToParseService=Services methods from the {0} endpoint could not be parsed. The following error occurred: {1}.
##Renderer
-FailedToRender=Failed to render gadget {0}: {1}
+FailedToRender=The gadget at {0} did not render. The following error occurred: {1}.
##RenderingGadgetRewriter
-unknownFeatures=Unknown feature(s) in extern &libs=: {0}
-unexpectedErrorPreloading=Unexpected error when preloading
+unknownFeatures=One or more unknown features exist in the following extern &libs=: {0}.
+unexpectedErrorPreloading=An unexpected error occurred when preloading the gadget.
##SanitizingResponseRewriter
-requestToSanitizeWithoutContent=Request to sanitize without content type for{0}
-requestToSanitizeUnknownContent=Request to sanitize unknown content type {0} for {1}
-unableToSanitizeUnknownImg=Unable to sanitize unknown image type {0}
-unableToDetectImgType=Unable to detect image type for {0} for sanitized content
+requestToSanitizeWithoutContent=A request to sanitize was issued without a content type for {0}.
+requestToSanitizeUnknownContent=A request to sanitize was issued without a known content type {0} for {1}.
+unableToSanitizeUnknownImg=The image type {0} is unknown and cannot be sanitized.
+unableToDetectImgType=The image type for {0} cannot be detected when sanitizing content.
##BasicImageRewriter
-ioErrorRewritingImg=IO Error rewriting image {0} - {1}
-unknownErrorRewritingImg=Unknown error rewriting image {0} {1}
-failedToReadImg=Failed to read image. Skipping {0} {1}
+ioErrorRewritingImg=The following input/output error occurred when rewriting the {0} image: {1}.
+unknownErrorRewritingImg=The following error occurred when rewriting the {0} image: {1}.
+failedToReadImg=The {0} image cannot be read and is being skipped. The following error occurred: {1}.
##CssResponseRewriter
-cajaCssParseFailure=Caja CSS parse failure: {0} for {1}
+cajaCssParseFailure=The following error occurred when parsing the Caja CSS: {0} for {1}.
##ImageAttributeRewriter
-unableToProcessImg=Unable to process the image resource {0}
-unableToReadResponse=Unable to read reponnse for the image resource {0}
-unableToFetchImg=Unable to fetch the image resource {0}
-unableToParseImg=Unable to parse the image resource {0}
+unableToProcessImg=The {0} image resource cannot be processed.
+unableToReadResponse=The response for the {0} image resource cannot be read.
+unableToFetchImg=The {0} image resource cannot be fetched.
+unableToParseImg=The {0} image resource cannot be parsed.
##MutableContent
-exceptionParsingContent=Got GadgetException when parsing content
+exceptionParsingContent=An exception occurred when parsing content for the gadget.
##PipelineDataGadgetRewriter
-failedToParsePreload=Failed to parse preload in {0}
+failedToParsePreload=The gadget at {0} could not be parsed for preloading.
##ProxyingVisitor
-uriExceptionParsing=Uri exception when parsing: {0}
+uriExceptionParsing=A Uniform Resource Identifier (URI) exception occurred when parsing the gadget at {0}.
##TemplateRewriter
-malformedTemplateLib=Exceptions due to malformed template libraries
+malformedTemplateLib=Exceptions occurred because of malformed template libraries.
##CajaContnetRewriter
-cajoledCacheCreated=Cajoled cache created
-retrieveReference=Retrieving: {0}
-unableToCajole=Unable to cajole gadget: {0}
+cajoledCacheCreated=A cajoled cache was created.
+retrieveReference={0} is being retrieved.
+unableToCajole=The gadget at {0} cannot be cajoled.
##ConcatProxyServlet
-concatProxyRequestFailed=Concat proxy request failed {0}
+concatProxyRequestFailed=The following error occurred when requesting a concatenated proxy: {0}.
##GadgetRenderingServlet
-malformedTtlValue=Bad TTL value {0} was ignored
+malformedTtlValue=An invalid Time To Live (TTL) value of {0} was ignored.
##ProxyServlet
-embededImgWrongDomain=Embed request for url {0} made to wrong domain {1}
+embededImgWrongDomain=The request to embed the {0} URL was made to the wrong domain {1}.
##DefaultTemplateProcessor
-elFailure=EL failure for gadget {0}: {1}
+elFailure=The following EL error occurred for the gadget at {0}: {1}.
##UriUtils
-skipIllegalHeader=Skipping illegal header: {0} : {1}
+skipIllegalHeader=The {0} header is illegal and is being skipped. The following error occurred: {1}.
##AbstractSpecFactory
-updateSpecFailureUseCacheVersion=Failed to update {0}. Using cached version.
-updateSpecFailureApplyNegCache=Failed to update {0}. Applying negative cache.
+updateSpecFailureUseCacheVersion=An error occurred when updating {0}. A cached version is being used instead.
+updateSpecFailureApplyNegCache=An error occurred when updating {0}. A negative cache is being applied.
##HashLockedDomainService
-noLocakedDomainConfig=No locked domain configuration for {0}
+noLockedDomainConfig=A locked domain configuration for {0} does not exist.
##Bootstrap
-startingConnManagerWith=Starting connection manager with properties {0}
+startingConnManagerWith=Connection manager with {0} properties is starting.
##XSDValidator
-resolveResource=resolveResource( {0}, {1}, {2}, {3} )
-failedToValidate=Failed to validate {0}
+resolveResource=The following resources are being resolved: {0}, {1}, {2}, {3}.
+failedToValidate=An error occurred when validating {0}.
Modified: shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties?rev=1183491&r1=1183490&r2=1183491&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties (original)
+++ shindig/trunk/java/common/src/main/resources/org/apache/shindig/common/logging/i18n/resource_en_US.properties Fri Oct 14 20:35:22 2011
@@ -17,156 +17,157 @@
##AuthenticationServletFilter
-errorParsingSecureToken=The input secure token or credential is malform and can not be parsed.
+errorParsingSecureToken=The security token or credential is malformed and cannot be parsed.
##XmlUtil
errorParsingXML=Error parsing the XML. This can be ignored.
-errorParsingExternalEntities=XML parsers will load external general entities.
-errorParsingExternalDTD=XML parsers will load external DTDs.
-errorNotUsingSecureXML=Not using secure XML processing.
-reuseDocumentBuilders=Reusing document builders.
-notReuseDocBuilders=Not reusing document builders.
+errorParsingExternalGeneralEntities=The XML processor being used will load external general entities.
+errorParsingExternalParameterEntities=The XML processor being used will load external parameter entities.
+errorParsingExternalDTD=The XML processor being used will load Document Type Definitions (DTD).
+errorNotUsingSecureXML=The XML processor being used does not support secure parsing.
+reuseDocumentBuilders=Document builders are being reused.
+notReuseDocBuilders=Document builders are not being reused.
##LruCacheProvider
-LRUCapacity={0} LRU capacity configured for {1}.
+LRUCapacity=The least recently used (LRU) capacity {0} is configured for {1}.
##DynamicConfigProperty
-evalExpressionFailed=Evaluation of {0} failed.
+evalExpressionFailed={0} cannot be evaluated.
##JsonContainerConfigLoader
-readingContainerConfig=Reading container config: {0}.
-loadFromString=Trouble parsing {0}.
+readingContainerConfig=Container configuration {0} is being read.
+loadFromString={0} cannot be parsed.
##JsonContainerConfigLoader, FeatureRegistry
-loadResourcesFrom=Loading resources from {0}.
+loadResourcesFrom=Resources from {0} are loading.
##JsonContainerConfigLoader, FeatureRegistry
-loadFilesFrom=Loading files from{0}
+loadFilesFrom=Files from {0} are loading.
##ApiServlet
-apiServletProtocalException=Returning a response error as result of a protocol exception.
-apiServletException=Returning a response error as result of a protocol exception.
+apiServletProtocolException=A response error is being returned because a protocol exception occurred.
+apiServletException=A response error is being returned because a protocol exception occurred.occurred.
##FeatureRegistry
-overridingFeature=Overriding feature: {0} with definition at: {1}
+overridingFeature=The {0} feature with definition at {1} is being overridden.
##FeatureResourceLoader
-missingFile=File existed before but is now missing! Name: {0}
-unableRetriveLib=Unable to retrieve remote library from: {0}
+missingFile=The file {0} used to exist but is now missing.
+unableRetrieveLib=The remote library from {0} cannot be retrieved.
##BasicHttpFetcher
-timeoutException=Timeout for {0} Exception: {1} - {2} - {3} ms
-exceptionOccurred=Got Exception fetching {0} - {1} ms
-slowResponse=Slow response from {0} {1} ms
+timeoutException={0} has timed out because of the following exception: {1} - {2} - {3} ms.
+exceptionOccurred=The following exception occurred when fetching {0}: {1} ms elapsed.
+slowResponse={0} is responding slowly. {1} ms elapsed.
##HttpResponseMetadataHelper
-errorGettingMD5=Error getting MD5 digest, ignored
-errorParsingMD5=Error parsing MD5 string as UTF8
+errorGettingMD5=An error occurred when getting Message Digest 5 (MD5). The error was ignored.
+errorParsingMD5=An error occurred when parsing the Message Digest 5 (MD5) string in UTF-8 format.
##OAuthModule
-usingRandomKey=Using random key for OAuth client-side state encryption
-usingFile=Using file {0} for OAuth client-side state encryption
-loadKeyFileFrom=Loading OAuth signing key from {0}
-couldNotLoadKeyFile=Couldn't load key file {0}
-couldNotLoadSignedKey=Couldn''t load OAuth signing key. To create a key, run:\n openssl req -newkey rsa:1024 -days 365 -nodes -x509 -keyout testkey.pem \\\n -out testkey.pem -subj '/CN=mytestkey'\n openssl pkcs8 -in testkey.pem -out oauthkey.pem -topk8 -nocrypt -outform PEM\n\n Then edit shindig.properties and add these lines:\n {0} =<path-to-oauthkey.pem>\n {1} =mykey\n
-failedToInit=Failed to initialize OAuth consumers from {0}
+usingRandomKey=A random key for OAuth client-side state encryption is being used.
+usingFile=The {0} file for OAuth client-side state encryption is being used.
+loadKeyFileFrom=The OAuth signing key from {0} is loading.
+couldNotLoadKeyFile= The {0} key file could not be loaded.
+couldNotLoadSignedKey=The OAuth signing key did not load correctly. To create a key: \n 1. Run the following command: \n openssl req -newkey rsa:1024 -days 365 -nodes -x509 -keyout testkey.pem \\\n -out testkey.pem -subj '/CN=mytestkey'\n openssl pkcs8 -in testkey.pem -out oauthkey.pem -topk8 -nocrypt -outform PEM\n\n. 2. Edit the shindig.properties file by adding these lines: \n{0} =<path-to-oauthkey.pem>\n {1} =mykey\n.
+failedToInit=OAuth consumers from {0} failed to initialize.
##OAuthRequest
-oauthFetchFatalError=OAuth fetch fatal error \n {0}
-oauthFetchErrorReprompt=OAuth fetch error, reprompting for user approval \n {0}
-bogusExpired=server returned bogus expiration \n {0}
-oauthFetchUnexpectedError=OAuth fetch unexpected fatal error \n {0}
-unauthenticatedOauth=Unauthenticated OAuth fetch \n {0}
-invalidOauth=Invalid OAuth fetch request \n {0}
+oauthFetchFatalError=The following fatal error occurred when OAuth was fetching content: \n {0}.
+oauthFetchErrorReprompt=The following error occurred when OAuth was fetching content: \n {0}. The user is being reprompted for approval.
+bogusExpired=The server returned an invalid expiration:\n {0}.
+oauthFetchUnexpectedError=The following fatal error occurred when OAuth was fetching content: \n {0}.
+unauthenticatedOauth=OAuth cannot fetch content because the user authentication does not exist. The following error occurred: \n {0}.
+invalidOauth=OAuth cannot fetch content because the request is invalid. The following error occurred: \n {0}.
##CajaCssSanitizer
-failedToParse=Failed to parse stylesheet
-unableToConvertScript=Unable to convert script node to an osml tag
+failedToParse=The style sheet cannot be parsed.
+unableToConvertScript=The script node cannot be converted to an OpenSocial Markup Language (OSML) tag.
##PipelineExecutor
-errorPreloading=Unexpected error when preloading
+errorPreloading=An unexpected error occurred when preloading.
##Processor
-renderNonWhitelistedGadget=Attempted to render a gadget not on the whitelist: {0}
+renderBlacklistedGadget=The system attempted to render the following blacklisted gadget: {0}.
##CajaResponseRewriter, CajaContentRewriter
-failedToRetrieve=Failed to retrieve {0}
-failedToRead=Failed to read {0}
+failedToRetrieve={0} cannot be retrieved.
+failedToRead={0} cannot be read.
##DefaultServiceFetcher
-httpErrorFetching=HTTP Error {0} fetching service methods from endpoint {1}
-failedToFetchService=Failed to fetch services methods from endpoint {0}. Error {1}
-failedToParseService=Failed to parse services methods from endpoint {0} {1}
+httpErrorFetching=An HTTP {0} error occurred when fetching service methods from the {1} endpoint.
+failedToFetchService=Services methods from the {0} endpoint could not be fetched. The following error occurred: {1}.
+failedToParseService=Services methods from the {0} endpoint could not be parsed. The following error occurred: {1}.
##Renderer
-FailedToRender=Failed to render gadget {0}: {1}
+FailedToRender=The gadget at {0} did not render. The following error occurred: {1}.
##RenderingGadgetRewriter
-unknownFeatures=Unknown feature(s) in extern &libs=: {0}
-unexpectedErrorPreloading=Unexpected error when preloading
+unknownFeatures=One or more unknown features exist in the following extern &libs=: {0}.
+unexpectedErrorPreloading=An unexpected error occurred when preloading the gadget.
##SanitizingResponseRewriter
-requestToSanitizeWithoutContent=Request to sanitize without content type for{0}
-requestToSanitizeUnknownContent=Request to sanitize unknown content type {0} for {1}
-unableToSanitizeUnknownImg=Unable to sanitize unknown image type {0}
-unableToDetectImgType=Unable to detect image type for {0} for sanitized content
+requestToSanitizeWithoutContent=A request to sanitize was issued without a content type for {0}.
+requestToSanitizeUnknownContent=A request to sanitize was issued without a known content type {0} for {1}.
+unableToSanitizeUnknownImg=The image type {0} is unknown and cannot be sanitized.
+unableToDetectImgType=The image type for {0} cannot be detected when sanitizing content.
##BasicImageRewriter
-ioErrorRewritingImg=IO Error rewriting image {0} - {1}
-unknownErrorRewritingImg=Unknown error rewriting image {0} {1}
-failedToReadImg=Failed to read image. Skipping {0} {1}
+ioErrorRewritingImg=The following input/output error occurred when rewriting the {0} image: {1}.
+unknownErrorRewritingImg=The following error occurred when rewriting the {0} image: {1}.
+failedToReadImg=The {0} image cannot be read and is being skipped. The following error occurred: {1}.
##CssResponseRewriter
-cajaCssParseFailure=Caja CSS parse failure: {0} for {1}
+cajaCssParseFailure=The following error occurred when parsing the Caja CSS: {0} for {1}.
##ImageAttributeRewriter
-unableToProcessImg=Unable to process the image resource {0}
-unableToReadResponse=Unable to read reponnse for the image resource {0}
-unableToFetchImg=Unable to fetch the image resource {0}
-unableToParseImg=Unable to parse the image resource {0}
+unableToProcessImg=The {0} image resource cannot be processed.
+unableToReadResponse=The response for the {0} image resource cannot be read.
+unableToFetchImg=The {0} image resource cannot be fetched.
+unableToParseImg=The {0} image resource cannot be parsed.
##MutableContent
-exceptionParsingContent=Got GadgetException when parsing content
+exceptionParsingContent=An exception occurred when parsing content for the gadget.
##PipelineDataGadgetRewriter
-failedToParsePreload=Failed to parse preload in {0}
+failedToParsePreload=The gadget at {0} could not be parsed for preloading.
##ProxyingVisitor
-uriExceptionParsing=Uri exception when parsing: {0}
+uriExceptionParsing=A Uniform Resource Identifier (URI) exception occurred when parsing the gadget at {0}.
##TemplateRewriter
-malformedTemplateLib=Exceptions due to malformed template libraries
+malformedTemplateLib=Exceptions occurred because of malformed template libraries.
##CajaContnetRewriter
-cajoledCacheCreated=Cajoled cache created
-retrieveReference=Retrieving: {0}
-unableToCajole=Unable to cajole gadget: {0}
+cajoledCacheCreated=A cajoled cache was created from en_US properties file.
+retrieveReference={0} is being retrieved.
+unableToCajole=The gadget at {0} cannot be cajoled.
##ConcatProxyServlet
-concatProxyRequestFailed=Concat proxy request failed {0}
+concatProxyRequestFailed=The following error occurred when requesting a concatenated proxy: {0}.
##GadgetRenderingServlet
-malformedTtlValue=Bad TTL value {0} was ignored
+malformedTtlValue=An invalid Time To Live (TTL) value of {0} was ignored.
##ProxyServlet
-embededImgWrongDomain=Embed request for url {0} made to wrong domain {1}
+embededImgWrongDomain=The request to embed the {0} URL was made to the wrong domain {1}.
##DefaultTemplateProcessor
-elFailure=EL failure for gadget {0}: {1}
+elFailure=The following EL error occurred for the gadget at {0}: {1}.
##UriUtils
-skipIllegalHeader=Skipping illegal header: {0} : {1}
+skipIllegalHeader=The {0} header is illegal and is being skipped. The following error occurred: {1}.
##AbstractSpecFactory
-updateSpecFailureUseCacheVersion=Failed to update {0}. Using cached version.
-updateSpecFailureApplyNegCache=Failed to update {0}. Applying negative cache.
+updateSpecFailureUseCacheVersion=An error occurred when updating {0}. A cached version is being used instead.
+updateSpecFailureApplyNegCache=An error occurred when updating {0}. A negative cache is being applied.
##HashLockedDomainService
-noLocakedDomainConfig=No locked domain configuration for {0}
+noLockedDomainConfig=A locked domain configuration for {0} does not exist.
##Bootstrap
-startingConnManagerWith=Starting connection manager with properties {0}
+startingConnManagerWith=Connection manager with {0} properties is starting.
##XSDValidator
-resolveResource=resolveResource( {0}, {1}, {2}, {3} )
-failedToValidate=Failed to validate {0}
+resolveResource=The following resources are being resolved: {0}, {1}, {2}, {3}.
+failedToValidate=An error occurred when validating {0}.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java?rev=1183491&r1=1183490&r2=1183491&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResourceLoader.java Fri Oct 14 20:35:22 2011
@@ -292,13 +292,13 @@ public class FeatureResourceLoader {
content = response.getResponseAsString();
} else {
if (LOG.isLoggable(Level.WARNING)) {
- LOG.logp(Level.WARNING, classname, "getContent", MessageKeys.UNABLE_RETRIVE_LIB,
+ LOG.logp(Level.WARNING, classname, "getContent", MessageKeys.UNABLE_RETRIEVE_LIB,
new Object[] {uri});
}
}
} catch (GadgetException e) {
if (LOG.isLoggable(Level.WARNING)) {
- LOG.logp(Level.WARNING, classname, "getContent", MessageKeys.UNABLE_RETRIVE_LIB,
+ LOG.logp(Level.WARNING, classname, "getContent", MessageKeys.UNABLE_RETRIEVE_LIB,
new Object[] {uri});
}
}