You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by jr...@apache.org on 2010/03/03 17:38:40 UTC
svn commit: r918558 - in /incubator/wink/trunk/wink-common/src:
main/resources/org/apache/wink/common/internal/i18n/resource.properties
test/java/org/apache/wink/common/model/app/AppTest.java
Author: jramos
Date: Wed Mar 3 16:38:40 2010
New Revision: 918558
URL: http://svn.apache.org/viewvc?rev=918558&view=rev
Log:
Update resource.properties messages
Modified:
incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/app/AppTest.java
Modified: incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties?rev=918558&r1=918557&r2=918558&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties (original)
+++ incubator/wink/trunk/wink-common/src/main/resources/org/apache/wink/common/internal/i18n/resource.properties Wed Mar 3 16:38:40 2010
@@ -16,149 +16,140 @@
# under the License.
# Class and Method Validation
-classNotAProvider={} is not a provider. Ignoring.
-classNotAResourceNorProvider={} is neither a resource nor a provider. Ignoring.
-classNotADynamicResourceNorResourceNorProvider={} is not a dynamic resource, resource, or provider. Ignoring.
-classAlreadyAdded=The class {} was already added. Ignored.
-classNotValid=The class {} may only have one of the following declarations: {}, {}, {}
-classIsUnknownProvider=Annotated @Provider class does not implement a recognized Provider interface: {}
-isNotAClass={} is not a class or the class has unresolved dependencies. Ignoring.
+classNotAProvider={0} is not a provider. Ignoring.
+classNotAResourceNorProvider={0} is neither a resource nor a provider. Ignoring.
+classNotADynamicResourceNorResourceNorProvider={0} is not a dynamic resource, resource, or provider. Ignoring.
+classAlreadyAdded=The class {0} was already added. Ignored.
+classNotValid=The class {0} may only have one of the following declarations: {1} {2} {3}
+classIsUnknownProvider=Annotated @Provider class does not implement a recognized Provider interface: {0}
isNotAClassWithMsgFormat={0} is not a class or the class has unresolved dependencies. Ignoring.
-resourceClassNotValid=The resource class {} is not a valid resource. Ignoring. Ensure that it has a javax.ws.rs.Path annotation and is unique.
-rootResourceInstanceIsAnInvalidResource=Root resource %s instance is an invalid resource. Ensure that it has a javax.ws.rs.Path annotation and is unique.
-classInstantiationException=Failed to instantiate class {}.
+resourceClassNotValid=The resource class {0} is not a valid resource. Ignoring. Ensure that it has a javax.ws.rs.Path annotation and is unique.
+rootResourceInstanceIsAnInvalidResource=Root resource {0} instance is an invalid resource. Ensure that it has a javax.ws.rs.Path annotation and is unique.
classInstantiationExceptionWithMsgFormat=Failed to instantiate class {0}.
-classIllegalAccess=Illegal access to {}.
classIllegalAccessWithMsgFormat=Illegal access to {0}.
-loadingClassToApplication=Class {} was added to application.
-loadingApplication=Loading application from {}.
+loadingClassToApplication=Class {0} was added to application.
+loadingApplication=Loading application from {0}
-
-exceptionOccurredDuringClassProcessing=An exception occurred during processing of class {}. Ignoring class.
+exceptionOccurredDuringClassProcessing=An exception occurred during processing of class {0} Ignoring class.
listExceptionDuringClassProcessing=The following exception occurred during processing of class:
-exceptionOccurredDuringSingletonProcessing=An exception occurred during processing of singleton {}. Ignoring singleton.
+exceptionOccurredDuringSingletonProcessing=An exception occurred during processing of singleton {0} Ignoring singleton.
listExceptionDuringSingletonProcessing=The following exception occurred during processing of class:
-exceptionOccurredDuringInstanceProcessing=An exception occurred during processing of instance {}. Ignoring.
+exceptionOccurredDuringInstanceProcessing=An exception occurred during processing of instance {0} Ignoring.
listExceptionDuringInstanceProcessing=The following exception occurred during processing of instance:
-methodNotAnnotatedCorrectly=The method {} in class {} is not annotated with an http method designator nor the Path annotation. This method will be ignored.
-subresourceLocatorIllegalEntityParameter=Sub-Resource locator {} contains an illegal entity parameter. The locator will be ignored.
-subresourceLocatorAnnotatedConsumesProduces=Sub-Resource locator {} is annotated with Consumes/Produces. These annotations are ignored for sub-resource locators
+methodNotAnnotatedCorrectly=The method {0} in class {1} is not annotated with an http method designator nor the Path annotation. This method will be ignored.
+subresourceLocatorIllegalEntityParameter=Sub-Resource locator {0} contains an illegal entity parameter. The locator will be ignored.
+subresourceLocatorAnnotatedConsumesProduces=Sub-Resource locator {0} is annotated with Consumes/Produces. These annotations are ignored for sub-resource locators
# Loading config
-configNotFound=Could not find {}. Ignoring.
+configNotFound=Could not find {0} Ignoring.
exceptionClosingFile=Exception when closing file
-propertyNotDefined={} property was not defined.
+propertyNotDefined={0} property was not defined.
alternateShortcutMapLoadFailure=Failed to load alternateShortcutMap
alternateShortcutMapCloseFailure=Exception when closing file:
# Provider Information
-uploadDirDoesNotExist=Upload directory '{}' does not exist or is not a directory, uploading entity to default temporary directory
-cannotUseFileAsResponse=Can not write file {} to response, file is not readable or is a directory
+uploadDirDoesNotExist=Upload directory {0} does not exist or is not a directory, uploading entity to default temporary directory
+cannotUseFileAsResponse=Can not write file {0} to response, file is not readable or is a directory
-jaxbObjectFactoryInstantiate=Failed to instantiate object factory for {}
+jaxbObjectFactoryInstantiate=Failed to instantiate object factory for {0}
# internals
-mediaTypeSetAlreadyContains=The set already contains {}. Skipping...
-mediaTypeMapperIncompleteRecord=Record {} is not complete, therefore ignored
-invalidServletContextAccessor=%s must be javax.servlet.http.HttpServletRequest or javax.servlet.http.HttpServletResponse.
+mediaTypeSetAlreadyContains=The set already contains {0} Skipping...
+invalidServletContextAccessor={0} must be javax.servlet.http.HttpServletRequest or javax.servlet.http.HttpServletResponse.
# writing
-noWriterOrDataSourceProvider=Could not find a writer or DataSourceProvider for {} type and {} mediaType.
-noWriterFound=Could not find a writer for {} type and {} mediaType.
+noWriterOrDataSourceProvider=Could not find a writer or DataSourceProvider for {0} type and {1} mediaType.
+noWriterFound=Could not find a writer for {0} type and {1} mediaType.
# Spring
-springClassReplaceNewerObjectFactory=The {} was replaced by a newer object factory.
-springBeanClassNotDynamicResource=The bean {} of class {} is not a DynamicResource.
-springBeanNotResourceNorProvider=The bean {} of class {} is neither resource nor provider
+springClassReplaceNewerObjectFactory=The {0} was replaced by a newer object factory.
+springBeanClassNotDynamicResource=The bean {0} of class {1} is not a DynamicResource.
+springBeanNotResourceNorProvider=The bean {0} of class {1} is neither resource nor provider
springExceptionOccurredDuringFieldInject=Exception occured during the fields injection for bean:
# Injection
-injectionFailureSingleton=Failed to inject fields of singleton {}
+injectionFailureSingleton=Failed to inject fields of singleton {0}
# Asset Provider
-assetLocatorMethodMoreThanOneEntityParam=Asset locator method {} has more than one entity parameter. Only a single entity parameter is allowed.
-assetMethodInvokeError=Error invoking asset method {}
-assetMustHavePublicConstructor=Failed to instantiate asset {}. Assets must have a default public contructor.
-assetCannotInstantiate=Cannot instantiate asset {}
+assetLocatorMethodMoreThanOneEntityParam=Asset locator method {0} has more than one entity parameter. Only a single entity parameter is allowed.
+assetMethodInvokeError=Error invoking asset method {0}
+assetMustHavePublicConstructor=Failed to instantiate asset {0} Assets must have a default public contructor.
+assetCannotInstantiate=Cannot instantiate asset {0}
# Atom Provider
-atomRequestEntityNotAtomEntry=Request entity is not an atom entry (it was unmarshalled as {})
-atomRequestEntityNotAtomFeed=Request entity is not an atom feed (it was unmarshalled as {})
+atomRequestEntityNotAtomEntry=Request entity is not an atom entry (it was unmarshalled as {0}
+atomRequestEntityNotAtomFeed=Request entity is not an atom feed (it was unmarshalled as {0}
# JSON Provider
jsonErrorSAXParserFeature=Error while setting SAX parser feature for JSON provider
jsonFailConvertXMLToJSON=Failed to convert XML to JSON
-jsonFailConvertJAXBToJSON=Failed to convert JAXB object {} to JSONObject
+jsonFailConvertJAXBToJSON=Failed to convert JAXB object {0} to JSONObject
jsonFailWriteJSONObject=Failed to write JSONObject
jsonFailReadJSONObject=Failed to read JSONObject
jsonFailWriteJSONArray=Failed to write JSONArray
jsonFailReadJSONArray=Failed to read JSONArray
# JAXB Provider
-jaxbObjectFactoryNotFound=ObjectFactory for {} was not found
-jaxbElementFailToBuild=Failed to build JAXBElement for {}
-jaxbObjectFactoryNotAnnotatedXMLRegistry=Found ObjectFactory for {} is not annotated with XmlRegistry.class
-jaxbFailToUnmarshal=Failed to unmarshal {}
-jaxbFailToMarshal=Failed to marshal {}
-jaxbCreateDefaultJAXBElement=Creating default JAXBElement for {}
+jaxbObjectFactoryNotFound=ObjectFactory for {0} was not found
+jaxbElementFailToBuild=Failed to build JAXBElement for {0}
+jaxbObjectFactoryNotAnnotatedXMLRegistry=Found ObjectFactory for {0} is not annotated with XmlRegistry.class
+jaxbFailToUnmarshal=Failed to unmarshal {0}
+jaxbFailToMarshal=Failed to marshal {0}
+jaxbCreateDefaultJAXBElement=Creating default JAXBElement for {0}
# Failure Messages
-mediaTypeWrongFormat=%1$s is an invalid MediaType format. Verify that the format is like "type/subtype".
-methodDoesNotHandleType=Method doesn't handle {}
+mediaTypeWrongFormat={0} is an invalid MediaType format. Verify that the format is like "type/subtype".
+methodDoesNotHandleType=Method does not handle {0}
unhandledExceptionToContainer=Unhandled exception
-exceptionOccurredDuringInvocation=%s occurred during the handlers chain invocation
+exceptionOccurredDuringInvocation={0} occurred during the handlers chain invocation
# Contexts
-uriBadBaseURI=bad base URI:
+uriBadBaseURI=Bad base URI: {0}
# Error Flow
exceptionOccurredDuringExceptionMapper=Exception occurred while executing toResponse of the ExceptionMapper
# WebDAV
-webDAVNoEditOrSelfLink=The resource {} has set no edit or self link
+webDAVNoEditOrSelfLink=The resource {0} has set no edit or self link
webDAVFailSetupPropertyHelper=Failed to setup property helper
webDAVFailCreateMarshaller=Failed to create WebDAV marshaller
webDAVFailCreateUnmarshaller=Failed to create WebDAV unmarshaller
-webDAVUnableToParseElement=Unable to parse the WebDAV \"%s\" element
-webDAVIncompatibleTypeInRequest=Incompatible type in the WebDAV \"%s\" element: received %s but the requested is %s
-webDAVUnableToMarshalElement=Unable to marshal the WebDAV \"%s\" element
-
-noMethodInClassSupportsHTTPMethod=Could not find any method in class {} that supports {}
-noMethodInClassConsumesHTTPMethod=Could not find any method in class {} that consumes {}
-noMethodInClassProducesHTTPMethod=Could not find any method in class {} capable of producing {}
+webDAVUnableToParseElement=Unable to parse the WebDAV {0} element
+webDAVIncompatibleTypeInRequest=Incompatible type in the WebDAV {0} element: received {1} but the requested is {2}
+webDAVUnableToMarshalElement=Unable to marshal the WebDAV {0} element
+
+noMethodInClassSupportsHTTPMethod=Could not find any method in class {0} that supports {1}
+noMethodInClassConsumesHTTPMethod=Could not find any method in class {0} that consumes {1}
+noMethodInClassProducesHTTPMethod=Could not find any method in class {0} capable of producing {1}
# Client Handler
-clientIssueRequest=Issuing client {} method request to URI at {} with {} entity class and {} headers
-clientAcceptHeaderHandlerSetAccept=Accept header automatically set to: {}
-clientResponseIsErrorCode=Client response is an error code: {}
+clientIssueRequest=Issuing client {0} method request to URI at {1} with {2} entity class and {3} headers
+clientAcceptHeaderHandlerSetAccept=Accept header automatically set to: {0}
+clientResponseIsErrorCode=Client response is an error code: {0}
clientConfigurationUnmodifiable=Client configuration is unmodifiable because it is in-use by a client. Please construct a new client configuration.
entityTypeMustBeParameterized=EntityType must be parameterized.
-clientNoWriterForTypeAndMediaType=No javax.ws.rs.ext.MessageBodyWriter found for type %s and media type %s . Verify that all entity providers are correctly registered.
-clientCannotConvertEntity=Entity of type %s cannot be cast as type %s
-clientNoReaderForTypeAndMediaType=No javax.ws.rs.ext.MessageBodyReader found for type %s and media type %s . Verify that all entity providers are correctly registered.
+clientNoWriterForTypeAndMediaType=No javax.ws.rs.ext.MessageBodyWriter found for type {0} and media type {1}. Verify that all entity providers are correctly registered.
+clientCannotConvertEntity=Entity of type {0} cannot be cast as type {1}
+clientNoReaderForTypeAndMediaType=No javax.ws.rs.ext.MessageBodyReader found for type {0} and media type {1}. Verify that all entity providers are correctly registered.
# Server Handlers
-checkLocationHeaderHandlerIllegalArg=Mandatory 'Location' header was not set for status code %1$s
+checkLocationHeaderHandlerIllegalArg=Mandatory "Location" header was not set for status code {0}
populateResponseMediaTypeHandlerFromCompatibleMessageBodyWriters=Content-Type not specified via Response object or via @javax.ws.rs.Produces annotation so automatically setting via generic-type compatible javax.ws.rs.ext.MessageBodyWriter providers
populateResponseMediaTypeHandlerNoAcceptableResponse=No acceptable concrete Content-Types, so sending a 406 Not Acceptable response to the client.
# Servlet/Filter Messages
-restServletJAXRSApplicationInitParam=Using application class {} named in init-param {}
-restServletWinkApplicationInitParam=Using application classes {} named in init-param {}
-restServletUseDeploymentConfigurationParam=Using deployment configuration class {} named in init-param {}
-restServletUsePropertiesFileAtLocation=Using properties file at {} named in init-param {}
-
-rootResourceShouldBeAnnotatedDirectly=The root resource class {0} should be annotated directly. In environments where annotation scanning is done automatically without an Application sub-class, the class may not be detected as a root resource.
-providerShouldBeAnnotatedDirectly=The provider class {0} should be annotated directly. In environments where annotation scanning is done automatically without an Application sub-class, the class may not be detected as a provider.
-
+restServletJAXRSApplicationInitParam=Using application class {0} named in init-param {1}
+restServletWinkApplicationInitParam=Using application classes {0} named in init-param {1}
+restServletUseDeploymentConfigurationParam=Using deployment configuration class {0} named in init-param {1}
+restServletUsePropertiesFileAtLocation=Using properties file at {0} named in init-param {1}
restServletRequestProcessorCouldNotBeCreated=Request processor could not be created.
adminServletRequestProcessorInitBeforeAdmin=Request processor should be initialized prior calling to admin servlet.
adminServletFailCreateJAXBForAdminServlet=Failed to create JAXBContext for AdminServlet
-adminServletFailMarshalObject=Failed to marshal object (%s)
+adminServletFailMarshalObject=Failed to marshal object {0}
# Server
-writerCannotGetOutputStreamSinceWriterRequested=Cannot get OutputStream since Writer already requested.
+cannotGetOutputStreamSinceWriterRequested=Cannot get OutputStream since Writer already requested.
writerCannotGetWriterSinceOutputStreamRequested=Cannot get Writer since OutputStream already requested.
rootResourceCollectionListIsNull=CollectionList is null.
@@ -166,3 +157,65 @@
parameterHttpIsEmptyOrNotInitialized=Parameter httpsURI is empty or not initialized
uriInfoInvalidURI=A URI with an invalid syntax was given.
methodCallOutsideScopeOfRequestContext=Method call made outside the scope of a request context.
+
+# others
+methodCannotHandleType=Method cannot handle {0}
+missingVariable=Missing variable {0}
+valueAtIndexIsNull=Value argument at index {0} is null
+variableIsEmpty=Value for variable {0} is empty
+resourceNotAnnotated=Resource is not annotated with {0} annotation
+methodNotAnnotated=Method is not annotated with {0} annotation
+methodWithClassNotAnnotatedCorrectly=Method {0} in class {1} is not annotated correctly.
+moreThanOneMethodAnnotated=More than one method with {0} annotation exists
+noMethodAnnotated=No method with {0} annotation exists
+invalidPort=Port is not valid
+isInvalid={0} is invalid
+segmentAtIndexIsNull=Segment at index {0} is null
+variableIsNull=Value for variable {0} is null
+variableNotSuppliedAValue=variable {0} was not supplied a value
+patternNotCompiled=Pattern not compiled
+syntaxErrorInvalidTemplateForm=Syntax error: {0} contains invalid template form
+valueFromMethodMustBeType=Value returned from method {0} must be of type {1}
+returnedTypeWas=Returned object was type {0}
+notASupportedResourceMethodParam=Type {0} is not a supported resource method parameter
+cannotConvertValueFromTo=Cannot convert value {0} to {1}
+cannotCreateFactoryForClass=Cannot create factory for class {0}
+cannotCreateDefaultFactoryForDR=Cannot create default factory for DynamicResource: {0}
+cannotCreateDefaultFactoryFor=Cannot create default factory for class: {0}
+cookieCannotContainAddlVers=Cookie cannot contain additional $Version: {0}
+cookieMustStartWithVersion=Cookie must start with $Version: {0}
+cookieDoesNotContainNAMEVALUE=Cookie does not contain NAME+VALUE: {0}
+failedToParseCookie=Failed to parse Cookie: {0}
+invalidCookie=Invalid Cookie: {0}
+jaxrsCacheControlTypeSupport=JAX-RS CacheControl type is designed to support only cache-response-directives
+headerIsNull={0} header is null
+cookieIsNull=Cookie is null
+cookieNameNotValid=Invalid Cookie - Cookie Name {0} is not valid
+cookieNameValueNotValid=Invalid Cookie - Cookie Name value {0} is not valid
+entityTagNotQuoted=Entity Tag {0} is not quoted properly
+cannotMixInlineAndOutOfLine=Cannot mix inline and out-of-line categories attributes
+failedToCreateJAXBContextFor=Failed to create JAXBContext for {0}
+contentMayHaveInlineOrOutContent=Content element may have either inline or out-of-line content
+typeAttribMustHaveValidMimeType=Type attribute of content element must be a valid mime type when content is out-of-line
+noValidConstructorFoundFor=No valid constructor found for {0}
+unsupportedOperator=Unsupported operator {0}
+methodHasMultipleEntityParams=Resource method {0} has more than one entity parameter
+multipleHTTPAnnotationsOnMethod=Multiple http method annotations on method {0} in class {1}
+errorSettingUpAtom=Error setting up Atom JAXB utils: {0}
+errorOccurredProcessingRequest=An error has occurred while processing a request
+conflictingParameterAnnotations=Conflicting parameter annotations for {0}
+couldNotFindWriter=Could not find a writer for {0} and {1} Try to find JAF DataSourceProvider
+cannotCastTo=Cannot cast {0} to {1}
+mediaTypeHeaderNull=MediaType header is null
+multiPartStreamAlreadyClosed=Stream already closed: The PartInputStream is not accessible after moving to the next part.
+lastMatchWasUnsuccessful=Last match was unsuccessful
+variableContainsMoreThanOneValueForJoinOperator=Variable '{0}' contains more than one value for join operator
+matchedSuffixMustEndWith=The matched suffix must end with '{0}'
+matchedSuffixMustStartWith=The matched suffix must start with '{0}'
+listOperatorMustHaveOnlyOneVariable=The list operator MUST only have one variable
+suffixOperatorMustOnlyHaveOneVariable=The suffix operator MUST only have one variable
+prefixOperatorMustHaveOnlyOneVariable=The prefix operator MUST only have one variable
+missingClientAuthenticationCredentialForUser=Missing client authentication credential for user: {0}
+serviceFailedToAuthenticateUser=Service failed to authenticate user: {0}
+providerShouldBeAnnotatedDirectly=@javax.ws.rs.ext.Provider was found on a superclass or interface on class {0}. Annotate @javax.ws.rs.ext.Provider on the provider class directly to ensure portability between environments.
+rootResourceShouldBeAnnotatedDirectly=@javax.ws.rs.Path was found on a superclass or interface on class {0}. Annotate @javax.ws.rs.Path on the root resource class directly to ensure portability between environments.
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/app/AppTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/app/AppTest.java?rev=918558&r1=918557&r2=918558&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/app/AppTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/app/AppTest.java Wed Mar 3 16:38:40 2010
@@ -143,7 +143,7 @@
try {
cats.setScheme("scheme");
} catch (RestException e) {
- assertEquals("Cannot mix inline and out-of-line categories attributes", e.getMessage());
+ assertEquals("cannot mix inline and out-of-line categories attributes", e.getMessage());
}
cats = new AppCategories();
@@ -151,7 +151,7 @@
try {
cats.setFixed(AppYesNo.YES);
} catch (RestException e) {
- assertEquals("Cannot mix inline and out-of-line categories attributes", e.getMessage());
+ assertEquals("cannot mix inline and out-of-line categories attributes", e.getMessage());
}
cats = new AppCategories();
@@ -160,7 +160,7 @@
try {
cats.setHref("scheme");
} catch (RestException e) {
- assertEquals("Cannot mix inline and out-of-line categories attributes", e.getMessage());
+ assertEquals("cannot mix inline and out-of-line categories attributes", e.getMessage());
}
cats = new AppCategories();