You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by ro...@apache.org on 2010/07/06 17:36:49 UTC
svn commit: r960918 [2/3] - in /incubator/wink/trunk:
wink-client/src/main/java/org/apache/wink/client/
wink-client/src/main/java/org/apache/wink/client/handlers/
wink-client/src/main/java/org/apache/wink/client/internal/
wink-client/src/main/java/org/...
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/MediaTypeHeaderDelegate.java Tue Jul 6 15:36:47 2010
@@ -36,15 +36,15 @@ public class MediaTypeHeaderDelegate imp
private static final Logger logger =
LoggerFactory
.getLogger(MediaTypeHeaderDelegate.class);
- private static final Pattern EQUALS = Pattern.compile("=");
- private static final Pattern SEMICOLON = Pattern.compile(";");
- private static final Pattern SLASH = Pattern.compile("/");
+ private static final Pattern EQUALS = Pattern.compile("="); //$NON-NLS-1$
+ private static final Pattern SEMICOLON = Pattern.compile(";"); //$NON-NLS-1$
+ private static final Pattern SLASH = Pattern.compile("/"); //$NON-NLS-1$
private static final SoftConcurrentMap<String, MediaType> cache =
new SoftConcurrentMap<String, MediaType>();
public MediaType fromString(String value) throws IllegalArgumentException {
if (value == null) {
- throw new IllegalArgumentException("MediaType header is null");
+ throw new IllegalArgumentException(Messages.getMessage("mediaTypeHeaderNull")); //$NON-NLS-1$
}
MediaType cached = cache.get(value);
@@ -62,8 +62,8 @@ public class MediaTypeHeaderDelegate imp
String main = all[0];
String[] mainArray = SLASH.split(main);
type = mainArray[0];
- if ("".equals(type)) {
- String errMsg = Messages.getMessage("mediaTypeWrongFormat", value);
+ if ("".equals(type)) { //$NON-NLS-1$
+ String errMsg = Messages.getMessage("mediaTypeWrongFormat", value); //$NON-NLS-1$
logger.error(errMsg);
throw new IllegalArgumentException(errMsg);
}
@@ -82,7 +82,7 @@ public class MediaTypeHeaderDelegate imp
}
}
} catch (ArrayIndexOutOfBoundsException e) {
- String errMsg = Messages.getMessage("mediaTypeWrongFormat", value);
+ String errMsg = Messages.getMessage("mediaTypeWrongFormat", value); //$NON-NLS-1$
logger.error(errMsg, e);
throw new IllegalArgumentException(errMsg, e);
}
@@ -92,14 +92,14 @@ public class MediaTypeHeaderDelegate imp
public String toString(MediaType value) {
if (value == null) {
- throw new IllegalArgumentException("MediaType header is null");
+ throw new IllegalArgumentException(Messages.getMessage("mediaTypeHeaderNull")); //$NON-NLS-1$
}
StringBuilder result = new StringBuilder();
- result.append(value.getType()).append("/").append(value.getSubtype());
+ result.append(value.getType()).append("/").append(value.getSubtype()); //$NON-NLS-1$
Map<String, String> params = value.getParameters();
for (String key : params.keySet()) {
- result.append(";").append(key).append("=").append(params.get(key));
+ result.append(";").append(key).append("=").append(params.get(key)); //$NON-NLS-1$ //$NON-NLS-2$
}
return result.toString();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/NewCookieHeaderDelegate.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/NewCookieHeaderDelegate.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/NewCookieHeaderDelegate.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/header/NewCookieHeaderDelegate.java Tue Jul 6 15:36:47 2010
@@ -23,21 +23,23 @@ import javax.ws.rs.core.Cookie;
import javax.ws.rs.core.NewCookie;
import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
+import org.apache.wink.common.internal.i18n.Messages;
+
public class NewCookieHeaderDelegate implements HeaderDelegate<NewCookie> {
public NewCookie fromString(String cookie) throws IllegalArgumentException {
if (cookie == null) {
- throw new IllegalArgumentException("Cookie is null");
+ throw new IllegalArgumentException(Messages.getMessage("cookieIsNull")); //$NON-NLS-1$
}
- String tokens[] = cookie.split(";");
+ String tokens[] = cookie.split(";"); //$NON-NLS-1$
ModifiableCookie modifiableCookie = null;
for (String token : tokens) {
- String[] subTokens = token.split("=", 2);
+ String[] subTokens = token.split("=", 2); //$NON-NLS-1$
String name = subTokens.length > 0 ? subTokens[0] : null;
String value = subTokens.length > 1 ? subTokens[1] : null;
- if (value != null && value.startsWith("\"")
- && value.endsWith("\"")
+ if (value != null && value.startsWith("\"") //$NON-NLS-1$
+ && value.endsWith("\"") //$NON-NLS-1$
&& value.length() > 1) {
value = value.substring(1, value.length() - 1);
}
@@ -45,28 +47,26 @@ public class NewCookieHeaderDelegate imp
// Create new NewCookie
if (modifiableCookie == null) {
if (name == null) {
- throw new IllegalArgumentException("Invalid Cookie - Cookie Name" + name
- + "is not valid");
+ throw new IllegalArgumentException(Messages.getMessage("cookieNameNotValid", name)); //$NON-NLS-1$
}
if (value == null) {
throw new IllegalArgumentException(
- "Invalid Cookie - Cookie Name value " + value
- + "is not valid");
+ Messages.getMessage("cookieNameValueNotValid", value)); //$NON-NLS-1$
}
modifiableCookie = new ModifiableCookie();
modifiableCookie.name = name;
modifiableCookie.value = value;
- } else if (name.trim().startsWith("Version")) {
+ } else if (name.trim().startsWith("Version")) { //$NON-NLS-1$
modifiableCookie.version = Integer.parseInt(value);
- } else if (name.trim().startsWith("Path")) {
+ } else if (name.trim().startsWith("Path")) { //$NON-NLS-1$
modifiableCookie.path = value;
- } else if (name.trim().startsWith("Domain")) {
+ } else if (name.trim().startsWith("Domain")) { //$NON-NLS-1$
modifiableCookie.domain = value;
- } else if (name.trim().startsWith("Comment")) {
+ } else if (name.trim().startsWith("Comment")) { //$NON-NLS-1$
modifiableCookie.comment = value;
- } else if (name.trim().startsWith("Max-Age")) {
+ } else if (name.trim().startsWith("Max-Age")) { //$NON-NLS-1$
modifiableCookie.maxAge = Integer.parseInt(value);
- } else if (name.trim().startsWith("Secure")) {
+ } else if (name.trim().startsWith("Secure")) { //$NON-NLS-1$
modifiableCookie.secure = true;
}
}
@@ -85,7 +85,7 @@ public class NewCookieHeaderDelegate imp
public String toString(NewCookie cookie) {
if (cookie == null) {
- throw new IllegalArgumentException("Cookie is null");
+ throw new IllegalArgumentException(Messages.getMessage("cookieIsNull")); //$NON-NLS-1$
}
return buildCookie(cookie.getName(), cookie.getValue(), cookie.getPath(), cookie
.getDomain(), cookie.getVersion(), cookie.getComment(), cookie.getMaxAge(), cookie
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/InjectableFactory.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/InjectableFactory.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/InjectableFactory.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/InjectableFactory.java Tue Jul 6 15:36:47 2010
@@ -37,6 +37,7 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Context;
import org.apache.wink.common.RuntimeContext;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.utils.GenericsUtils;
public class InjectableFactory {
@@ -116,8 +117,7 @@ public class InjectableFactory {
}
if (annotationsCounter > 1) {
- throw new IllegalStateException("Conflicting parameter annotations for " + member
- .getName());
+ throw new IllegalStateException(Messages.getMessage("conflictingParameterAnnotations", member.getName())); //$NON-NLS-1$
}
if (matrix != null) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ValueConvertor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ValueConvertor.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ValueConvertor.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ValueConvertor.java Tue Jul 6 15:36:47 2010
@@ -28,7 +28,6 @@ import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -38,6 +37,7 @@ import java.util.TreeSet;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.PathSegment;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.utils.GenericsUtils;
import org.apache.wink.common.internal.utils.UriHelper;
@@ -137,20 +137,19 @@ public abstract class ValueConvertor {
// http://jcp.org/aboutJava/communityprocess/maintenance/jsr311/311ChangeLog.html
// precendence for enums is fromString, then valueOf
try {
- Method valueOf = classType.getDeclaredMethod("fromString", String.class);
+ Method valueOf = classType.getDeclaredMethod("fromString", String.class); //$NON-NLS-1$
return new FromStringConvertor(valueOf);
} catch (SecurityException e) {
} catch (NoSuchMethodException e) {
try {
- Method fromString = classType.getDeclaredMethod("valueOf", String.class);
+ Method fromString = classType.getDeclaredMethod("valueOf", String.class); //$NON-NLS-1$
return new ValueOfConvertor(fromString);
} catch (SecurityException e2) {
} catch (NoSuchMethodException e2) {
}
}
- throw new IllegalArgumentException("type '" + classType
- + "' is not a supported resource method parameter");
+ throw new IllegalArgumentException(Messages.getMessage("notASupportedResourceMethodParam", classType)); //$NON-NLS-1$
}
private static ValueConvertor getSingleValueConvertor(Class<?> classType) {
@@ -188,15 +187,14 @@ public abstract class ValueConvertor {
// http://jcp.org/aboutJava/communityprocess/maintenance/jsr311/311ChangeLog.html
// fallback to fromString method when no valueOf method exists
try {
- Method fromString = classType.getDeclaredMethod("fromString", String.class);
+ Method fromString = classType.getDeclaredMethod("fromString", String.class); //$NON-NLS-1$
return new FromStringConvertor(fromString);
} catch (SecurityException e2) {
} catch (NoSuchMethodException e2) {
}
}
- throw new IllegalArgumentException("type '" + classType
- + "' is not a supported resource method parameter");
+ throw new IllegalArgumentException(Messages.getMessage("notASupportedResourceMethodParam", classType)); //$NON-NLS-1$
}
private static class ArrayValueConvertor extends ValueConvertor {
@@ -236,8 +234,7 @@ public abstract class ValueConvertor {
if (e instanceof WebApplicationException) {
return (RuntimeException)e;
}
- String message = String.format("Cannot convert value '%s' to %s", value, targetClass);
- return new ConversionException(message, e);
+ return new ConversionException(Messages.getMessage("cannotConvertValueFromTo", value, targetClass), e); //$NON-NLS-1$
}
public Object convert(List<String> values) throws WebApplicationException {
@@ -296,9 +293,8 @@ public abstract class ValueConvertor {
// enforce E009 from http://jcp.org/aboutJava/communityprocess/maintenance/jsr311/311ChangeLog.html
// note that we don't care what return object type the method declares, only what it actually returns
throw createConversionException(value, method.getDeclaringClass(),
- new Exception("Value returned from method " + method.toString() + " must be "
- + "of type " + method.getDeclaringClass() + ". "
- + "Returned object was type " + objToReturn.getClass()));
+ new Exception(Messages.getMessage("valueFromMethodMustBeType", method.toString(), method.getDeclaringClass()) //$NON-NLS-1$
+ + " " + Messages.getMessage("returnedTypeWas", objToReturn.getClass()))); //$NON-NLS-1$ //$NON-NLS-2$
}
return objToReturn;
} catch (IllegalArgumentException e) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ProviderMetadataCollector.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ProviderMetadataCollector.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ProviderMetadataCollector.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ProviderMetadataCollector.java Tue Jul 6 15:36:47 2010
@@ -55,7 +55,7 @@ public class ProviderMetadataCollector e
if (Modifier.isInterface(cls.getModifiers()) || Modifier.isAbstract(cls.getModifiers())) {
if (logger.isWarnEnabled()) {
- logger.warn(Messages.getMessage("providerIsInterfaceOrAbstract", cls));
+ logger.warn(Messages.getMessage("providerIsInterfaceOrAbstract", cls)); //$NON-NLS-1$
}
return false;
}
@@ -71,7 +71,7 @@ public class ProviderMetadataCollector e
Class<?> superclass = declaringClass.getSuperclass();
if (superclass != null && superclass.getAnnotation(Provider.class) != null) {
if (logger.isWarnEnabled()) {
- logger.warn(Messages.getMessage("providerShouldBeAnnotatedDirectly", cls));
+ logger.warn(Messages.getMessage("providerShouldBeAnnotatedDirectly", cls)); //$NON-NLS-1$
}
return true;
}
@@ -81,7 +81,7 @@ public class ProviderMetadataCollector e
for (Class<?> interfaceClass : interfaces) {
if (interfaceClass.getAnnotation(Provider.class) != null) {
if (logger.isWarnEnabled()) {
- logger.warn(Messages.getMessage("providerShouldBeAnnotatedDirectly", cls));
+ logger.warn(Messages.getMessage("providerShouldBeAnnotatedDirectly", cls)); //$NON-NLS-1$
}
return true;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/ResourceMetadataCollector.java Tue Jul 6 15:36:47 2010
@@ -77,7 +77,7 @@ public class ResourceMetadataCollector e
Class<?> superclass = declaringClass.getSuperclass();
if (superclass.getAnnotation(Path.class) != null) {
if (logger.isWarnEnabled()) {
- logger.warn(Messages.getMessage("rootResourceShouldBeAnnotatedDirectly", cls));
+ logger.warn(Messages.getMessage("rootResourceShouldBeAnnotatedDirectly", cls)); //$NON-NLS-1$
}
return true;
}
@@ -87,7 +87,7 @@ public class ResourceMetadataCollector e
for (Class<?> interfaceClass : interfaces) {
if (interfaceClass.getAnnotation(Path.class) != null) {
if (logger.isWarnEnabled()) {
- logger.warn(Messages.getMessage("rootResourceShouldBeAnnotatedDirectly",
+ logger.warn(Messages.getMessage("rootResourceShouldBeAnnotatedDirectly", //$NON-NLS-1$
cls));
}
return true;
@@ -217,12 +217,12 @@ public class ResourceMetadataCollector e
// verify that the method does not take an entity
// parameter
String methodName =
- String.format("%s.%s", declaringClass.getName(), method.getName());
+ String.format("%s.%s", declaringClass.getName(), method.getName()); //$NON-NLS-1$
for (Injectable id : methodMetadata.getFormalParameters()) {
if (id.getParamType() == Injectable.ParamType.ENTITY) {
if (logger.isWarnEnabled()) {
logger.warn(Messages
- .getMessage("subresourceLocatorIllegalEntityParameter",
+ .getMessage("subresourceLocatorIllegalEntityParameter", //$NON-NLS-1$
methodName));
}
continue F1;
@@ -234,7 +234,7 @@ public class ResourceMetadataCollector e
.getProduces().isEmpty()) {
if (logger.isWarnEnabled()) {
logger.warn(Messages
- .getMessage("subresourceLocatorAnnotatedConsumesProduces",
+ .getMessage("subresourceLocatorAnnotatedConsumesProduces", //$NON-NLS-1$
methodName));
}
}
@@ -338,7 +338,7 @@ public class ResourceMetadataCollector e
return null;
}
if (logger.isWarnEnabled()) {
- logger.warn(Messages.getMessage("methodNotAnnotatedCorrectly",
+ logger.warn(Messages.getMessage("methodNotAnnotatedCorrectly", //$NON-NLS-1$
method.getName(),
method.getDeclaringClass().getCanonicalName()));
}
@@ -416,8 +416,7 @@ public class ResourceMetadataCollector e
HttpMethod httpMethodCurr = annotation.annotationType().getAnnotation(HttpMethod.class);
if (httpMethodCurr != null) {
if (httpMethod != null) {
- throw new IllegalStateException(String
- .format("Multiple http method annotations on method %s in class %s", method
+ throw new IllegalStateException(Messages.getMessage("multipleHttpMethodAnnotations", method //$NON-NLS-1$
.getName(), method.getDeclaringClass().getCanonicalName()));
}
httpMethod = httpMethodCurr;
@@ -450,9 +449,8 @@ public class ResourceMetadataCollector e
if (entityParamExists) {
// we are allowed to have only one entity parameter
String methodName =
- method.getDeclaringClass().getName() + "." + method.getName();
- throw new IllegalStateException("Resource method " + methodName
- + " has more than one entity parameter");
+ method.getDeclaringClass().getName() + "." + method.getName(); //$NON-NLS-1$
+ throw new IllegalStateException(Messages.getMessage("resourceMethodMoreThanOneEntityParam", methodName)); //$NON-NLS-1$
}
entityParamExists = true;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/JaxRsUriTemplateProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/JaxRsUriTemplateProcessor.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/JaxRsUriTemplateProcessor.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/JaxRsUriTemplateProcessor.java Tue Jul 6 15:36:47 2010
@@ -25,6 +25,7 @@ import java.util.regex.Pattern;
import javax.ws.rs.core.MultivaluedMap;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.uri.UriEncoder;
/**
@@ -284,11 +285,11 @@ public class JaxRsUriTemplateProcessor e
public void variable(String name, String regex) {
if (values == null) {
- throw new NullPointerException("variable '" + name + "' was not supplied a value");
+ throw new NullPointerException(Messages.getMessage("variableNotSuppliedAValue", name)); //$NON-NLS-1$
}
String valueStr = values.getFirst(name);
if (valueStr == null) {
- throw new NullPointerException("variable '" + name + "' was not supplied a value");
+ throw new NullPointerException(Messages.getMessage("variableNotSuppliedAValue", name)); //$NON-NLS-1$
}
out.append(valueStr);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/uritemplate/UriTemplateProcessor.java Tue Jul 6 15:36:47 2010
@@ -32,6 +32,7 @@ import javax.ws.rs.core.MultivaluedMap;
import org.apache.wink.common.http.HttpStatus;
import org.apache.wink.common.internal.MultivaluedMapImpl;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.uri.UriEncoder;
import org.apache.wink.common.internal.utils.UriHelper;
@@ -274,7 +275,7 @@ public abstract class UriTemplateProcess
protected void assertPatternState() {
if (pattern == null) {
- throw new IllegalStateException("pattern not compiled");
+ throw new IllegalStateException(Messages.getMessage("patternNotCompiled")); //$NON-NLS-1$
}
}
@@ -376,8 +377,7 @@ public abstract class UriTemplateProcess
private static void assertValid(String literal) {
// assert that the literal does not contain curly brackets
if (literal.indexOf('{') != -1 || literal.indexOf('}') != -1) {
- throw new IllegalArgumentException("Syntax error: '" + literal
- + "' contains invalid template form");
+ throw new IllegalArgumentException(Messages.getMessage("variableNotSuppliedAValue", literal)); //$NON-NLS-1$
}
}
@@ -505,8 +505,7 @@ public abstract class UriTemplateProcess
}
if (value == null) {
- throw new IllegalArgumentException("variable '" + name
- + "' was not supplied a value");
+ throw new IllegalArgumentException(Messages.getMessage("syntaxErrorInvalidTemplateForm", name)); //$NON-NLS-1$
}
if (encode) {
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/GenericsUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/GenericsUtils.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/GenericsUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/GenericsUtils.java Tue Jul 6 15:36:47 2010
@@ -26,6 +26,7 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.lang.reflect.WildcardType;
+import org.apache.wink.common.internal.i18n.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -164,7 +165,7 @@ public class GenericsUtils {
return getClassType(((WildcardType)type).getUpperBounds()[0]);
}
- logger.error("Method cannot handle '{}'", String.valueOf(type));
+ logger.error(Messages.getMessage("methodCannotHandleType", String.valueOf(type))); //$NON-NLS-1$
return null;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/OpenSearchUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/OpenSearchUtils.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/OpenSearchUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/OpenSearchUtils.java Tue Jul 6 15:36:47 2010
@@ -40,7 +40,7 @@ public class OpenSearchUtils {
*/
public static OpenSearchImage createOpenSearchImage(String mediaTypeString, String url) {
if (mediaTypeString == null) {
- throw new NullPointerException("mediaType parameter is null");
+ throw new NullPointerException(Messages.getMessage("variableIsNull", "mediaTypeString")); //$NON-NLS-1$ //$NON-NLS-2$
}
OpenSearchImage image = new OpenSearchImage();
MediaType mediaType = MediaType.valueOf(mediaTypeString);
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/UriHelper.java Tue Jul 6 15:36:47 2010
@@ -35,12 +35,16 @@ import org.apache.wink.common.internal.M
import org.apache.wink.common.internal.PathSegmentImpl;
import org.apache.wink.common.internal.uri.UriEncoder;
import org.apache.wink.common.internal.uri.UriPathNormalizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Various methods for URI/URL manipulation.
*/
public class UriHelper {
+ private static final Logger logger = LoggerFactory.getLogger(UriHelper.class);
+
// no instances
private UriHelper() {
}
@@ -434,12 +438,14 @@ public class UriHelper {
* @return list of PathSegement instances
*/
public static List<PathSegment> parsePath(String path) {
+ logger.debug("parsePath({}) entry", path); //$NON-NLS-1$
String[] segmentsArray = StringUtils.fastSplitTemplate(path, "/", true); //$NON-NLS-1$
List<PathSegment> pathSegments = new ArrayList<PathSegment>(segmentsArray.length);
// go over all the segments and add them
for (String segment : segmentsArray) {
pathSegments.add(new PathSegmentImpl(segment));
}
+ logger.debug("parsePath() exit returning {}", pathSegments); //$NON-NLS-1$
return pathSegments;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppCategories.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppCategories.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppCategories.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppCategories.java Tue Jul 6 15:36:47 2010
@@ -43,6 +43,7 @@ import javax.xml.bind.annotation.XmlTran
import javax.xml.bind.annotation.XmlType;
import org.apache.wink.common.RestException;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.model.ModelUtils;
import org.apache.wink.common.internal.utils.JAXBUtils;
import org.apache.wink.common.model.atom.AtomCategory;
@@ -120,7 +121,7 @@ public class AppCategories {
boolean isFixedSet = false;
private static final String ERROR_MESSAGE =
- "cannot mix inline and out-of-line categories attributes";
+ Messages.getMessage("cannotMixInlineAndOutOfLine"); //$NON-NLS-1$
// ============================
@XmlTransient
@@ -130,7 +131,7 @@ public class AppCategories {
try {
context = JAXBContext.newInstance(AppCategories.class.getPackage().getName());
} catch (JAXBException e) {
- throw new RestException("Failed to create JAXBContext for AppCategories", e);
+ throw new RestException(Messages.getMessage("failedToCreateJAXBContextFor", "AppCategories"), e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppService.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppService.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppService.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/app/AppService.java Tue Jul 6 15:36:47 2010
@@ -45,6 +45,7 @@ import javax.xml.bind.annotation.XmlTran
import javax.xml.bind.annotation.XmlType;
import org.apache.wink.common.RestException;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.model.ModelUtils;
import org.apache.wink.common.internal.utils.JAXBUtils;
import org.apache.wink.common.model.atom.AtomCommonAttributes;
@@ -88,7 +89,7 @@ public class AppService extends AtomComm
try {
context = JAXBContext.newInstance(AppService.class.getPackage().getName());
} catch (JAXBException e) {
- throw new RestException("Failed to create JAXBContext for AppService", e);
+ throw new RestException(Messages.getMessage("failedToCreateJAXBContextFor", "AppService"), e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomContent.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomContent.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomContent.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomContent.java Tue Jul 6 15:36:47 2010
@@ -38,6 +38,7 @@ import javax.xml.bind.annotation.XmlTran
import javax.xml.bind.annotation.XmlType;
import org.apache.wink.common.RestException;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.model.AnyContentHandler;
import org.apache.wink.common.internal.model.ModelUtils;
import org.apache.wink.common.model.synd.SyndContent;
@@ -400,11 +401,11 @@ public class AtomContent extends AtomCom
public void checkValidity() {
if (src != null && any != null) {
- throw new RestException("Content element may have either inline or out-of-line content");
+ throw new RestException(Messages.getMessage("contentMayHaveInlineOrOutContent")); //$NON-NLS-1$
} else if (src != null && type != null) {
- if (type.equals("text") || type.equals("html") || type.equals("xhtml")) {
+ if (type.equals("text") || type.equals("html") || type.equals("xhtml")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
throw new RestException(
- "Type attribute of content element must be a valid mime type when content is out-of-line");
+ Messages.getMessage("typeAttribMustHaveValidMimeType")); //$NON-NLS-1$
}
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomFeed.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomFeed.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomFeed.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/atom/AtomFeed.java Tue Jul 6 15:36:47 2010
@@ -52,6 +52,7 @@ import javax.xml.datatype.XMLGregorianCa
import org.apache.wink.common.RestConstants;
import org.apache.wink.common.RestException;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.model.ModelUtils;
import org.apache.wink.common.internal.utils.JAXBUtils;
import org.apache.wink.common.model.opensearch.OpenSearchDescription;
@@ -182,10 +183,10 @@ public class AtomFeed extends AtomCommon
static {
try {
atomContext =
- JAXBContext.newInstance(AtomFeed.class.getPackage().getName() + ":"
+ JAXBContext.newInstance(AtomFeed.class.getPackage().getName() + ":" //$NON-NLS-1$
+ OpenSearchDescription.class.getPackage().getName());
} catch (JAXBException e) {
- throw new RestException("Failed to create JAXBContext for AtomFeed", e);
+ throw new RestException(Messages.getMessage("failedToCreateJAXBContextFor", "AtomFeed"), e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutPart.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutPart.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutPart.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/multipart/OutPart.java Tue Jul 6 15:36:47 2010
@@ -31,6 +31,7 @@ import javax.ws.rs.ext.MessageBodyWriter
import javax.ws.rs.ext.Providers;
import org.apache.wink.common.internal.CaseInsensitiveMultivaluedMap;
+import org.apache.wink.common.internal.i18n.Messages;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -97,9 +98,8 @@ public class OutPart {
.valueOf(getContentType()));
if (writer == null) {
logger
- .warn("Could not find a writer for {} and {}. Try to find JAF DataSourceProvider",
- getBody().getClass(),
- getContentType());
+ .warn(Messages.getMessage("couldNotFindWriter", getBody().getClass(), //$NON-NLS-1$
+ getContentType()));
throw new WebApplicationException(500);
}
writer.writeTo(getBody(), getBody().getClass(), null, null, MediaType
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchDescription.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchDescription.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchDescription.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/opensearch/OpenSearchDescription.java Tue Jul 6 15:36:47 2010
@@ -44,6 +44,7 @@ import javax.xml.bind.annotation.XmlType
import javax.xml.namespace.QName;
import org.apache.wink.common.RestException;
+import org.apache.wink.common.internal.i18n.Messages;
import org.apache.wink.common.internal.utils.JAXBUtils;
/**
@@ -395,7 +396,7 @@ public class OpenSearchDescription {
try {
context = JAXBContext.newInstance(OpenSearchDescription.class.getPackage().getName());
} catch (JAXBException e) {
- throw new RestException("Failed to create JAXBContext for OpenSearchDescription", e);
+ throw new RestException(Messages.getMessage("failedToCreateJAXBContextFor", "OpenSearchDescription"), e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssChannel.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssChannel.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssChannel.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssChannel.java Tue Jul 6 15:36:47 2010
@@ -278,7 +278,7 @@ public class RssChannel {
protected List<Object> any;
protected List<RssItem> item;
- private static String RSS_DATE_FORMAT = "EEE, d MMM yyyy HH:mm:ss z";
+ private static String RSS_DATE_FORMAT = "EEE, d MMM yyyy HH:mm:ss z"; //$NON-NLS-1$
private static final Logger logger = LoggerFactory.getLogger(RssChannel.class);
/**
@@ -301,7 +301,7 @@ public class RssChannel {
if (syndFeed.getTitle() != null && syndFeed.getTitle().getValue() != null) {
setTitle(syndFeed.getTitle().getValue());
}
- SyndLink link = syndFeed.getLink("alternate");
+ SyndLink link = syndFeed.getLink("alternate"); //$NON-NLS-1$
if (link != null && link.getHref() != null) {
setLink(link.getHref());
}
@@ -366,7 +366,7 @@ public class RssChannel {
if (getLink() != null) {
SyndLink syndLink = new SyndLink();
syndLink.setHref(getLink());
- syndLink.setRel("alternate");
+ syndLink.setRel("alternate"); //$NON-NLS-1$
syndFeed.getLinks().add(syndLink);
}
if (getDescription() != null) {
@@ -382,7 +382,7 @@ public class RssChannel {
SyndPerson syndAuthor = new SyndPerson();
String authorEmail = getManagingEditor();
syndAuthor.setEmail(authorEmail);
- syndAuthor.setName(authorEmail.substring(0, authorEmail.indexOf("@")));
+ syndAuthor.setName(authorEmail.substring(0, authorEmail.indexOf("@"))); //$NON-NLS-1$
syndFeed.getAuthors().add(syndAuthor);
}
if (getLastBuildDate() != null) {
@@ -813,7 +813,7 @@ public class RssChannel {
try {
return format.parse(rssDate);
} catch (ParseException e) {
- logger.error(Messages.getMessage("listExceptionDuringClassProcessing"), e);
+ logger.error(Messages.getMessage("listExceptionDuringClassProcessing"), e); //$NON-NLS-1$
}
return null;
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssEnclosure.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssEnclosure.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssEnclosure.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssEnclosure.java Tue Jul 6 15:36:47 2010
@@ -115,7 +115,7 @@ public class RssEnclosure {
if (syndLink == null) {
return syndLink;
}
- syndLink.setRel("enclosure");
+ syndLink.setRel("enclosure"); //$NON-NLS-1$
syndLink.setType(getType());
syndLink.setLength(getLength());
syndLink.setHref(getUrl());
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssFeed.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssFeed.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssFeed.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssFeed.java Tue Jul 6 15:36:47 2010
@@ -88,7 +88,7 @@ public class RssFeed {
*/
public RssFeed(SyndFeed syndFeed) {
setChannel(new RssChannel(syndFeed));
- setVersion("2.0");
+ setVersion("2.0"); //$NON-NLS-1$
}
/**
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssItem.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssItem.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssItem.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/model/rss/RssItem.java Tue Jul 6 15:36:47 2010
@@ -193,7 +193,7 @@ public class RssItem {
if (syndEntry.getTitle() != null && syndEntry.getTitle().getValue() != null) {
setTitle(syndEntry.getTitle().getValue());
}
- SyndLink link = syndEntry.getLink("alternate");
+ SyndLink link = syndEntry.getLink("alternate"); //$NON-NLS-1$
if (link != null && link.getHref() != null) {
setLink(link.getHref());
}
@@ -210,7 +210,7 @@ public class RssItem {
for (SyndCategory syndCategory : syndEntry.getCategories()) {
getCategories().add(new RssCategory(syndCategory));
}
- link = syndEntry.getLink("enclosure");
+ link = syndEntry.getLink("enclosure"); //$NON-NLS-1$
if (link != null) {
setEnclosure(new RssEnclosure(link));
}
@@ -243,7 +243,7 @@ public class RssItem {
if (getLink() != null) {
SyndLink syndLink = new SyndLink();
syndLink.setHref(getLink());
- syndLink.setRel("alternate");
+ syndLink.setRel("alternate"); //$NON-NLS-1$
syndEntry.getLinks().add(syndLink);
}
if (getDescription() != null) {
@@ -253,7 +253,7 @@ public class RssItem {
SyndPerson syndAuthor = new SyndPerson();
String authorEmail = getAuthor();
syndAuthor.setEmail(authorEmail);
- syndAuthor.setName(authorEmail.substring(0, authorEmail.indexOf("@")));
+ syndAuthor.setName(authorEmail.substring(0, authorEmail.indexOf("@"))); //$NON-NLS-1$
syndEntry.getAuthors().add(syndAuthor);
}
syndEntry.getCategories().clear();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java?rev=960918&r1=960917&r2=960918&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/utils/ProviderUtils.java Tue Jul 6 15:36:47 2010
@@ -54,7 +54,7 @@ public class ProviderUtils {
LoggerFactory
.getLogger(ProviderUtils.class);
- private static final String DEFAULT_CHARSET = "UTF-8";
+ private static final String DEFAULT_CHARSET = "UTF-8"; //$NON-NLS-1$
private static SoftConcurrentMap<String, Boolean> validCharsets =
new SoftConcurrentMap<String, Boolean>();
@@ -80,15 +80,15 @@ public class ProviderUtils {
* @return the charset
*/
public static String getCharset(MediaType m, HttpHeaders requestHeaders) {
- logger.debug("getCharset({}, {})", m, requestHeaders);
+ logger.debug("getCharset({}, {})", m, requestHeaders); //$NON-NLS-1$
String name = (m == null) ? null : m.getParameters().get("charset"); //$NON-NLS-1$
if (name != null) {
- logger.debug("getCharset() returning {} since parameter was set", name);
+ logger.debug("getCharset() returning {} since parameter was set", name); //$NON-NLS-1$
return name;
}
if (requestHeaders == null) {
logger
- .debug("getCharset() returning {} since requestHeaders was null", DEFAULT_CHARSET);
+ .debug("getCharset() returning {} since requestHeaders was null", DEFAULT_CHARSET); //$NON-NLS-1$
return DEFAULT_CHARSET;
}
@@ -97,7 +97,7 @@ public class ProviderUtils {
if (acceptableCharsets == null || acceptableCharsets.isEmpty()) {
// HTTP spec says that no Accept-Charset header indicates that any
// charset is acceptable so we'll stick with UTF-8 by default.
- logger.debug("getCharset() returning {} since no Accept-Charset header",
+ logger.debug("getCharset() returning {} since no Accept-Charset header", //$NON-NLS-1$
DEFAULT_CHARSET);
return DEFAULT_CHARSET;
}
@@ -109,7 +109,7 @@ public class ProviderUtils {
acceptCharsetsTemp.append(acceptableCharsets.get(c));
}
String acceptCharsets = acceptCharsetsTemp.toString();
- logger.debug("acceptCharsets combined value is {}", acceptCharsets);
+ logger.debug("acceptCharsets combined value is {}", acceptCharsets); //$NON-NLS-1$
String cached = preferredCharsets.get(acceptCharsets);
if (cached != null) {
return cached;
@@ -122,7 +122,7 @@ public class ProviderUtils {
}
List<String> orderedCharsets = charsets.getAcceptableCharsets();
- logger.debug("orderedCharsets is {}", orderedCharsets);
+ logger.debug("orderedCharsets is {}", orderedCharsets); //$NON-NLS-1$
if (!orderedCharsets.isEmpty()) {
for (int c = 0; c < orderedCharsets.size(); ++c) {
String charset = orderedCharsets.get(c);
@@ -130,25 +130,25 @@ public class ProviderUtils {
Boolean b = validCharsets.get(charset);
if (b != null && b.booleanValue()) {
logger
- .debug("getCharset() returning {} since highest Accept-Charset value",
+ .debug("getCharset() returning {} since highest Accept-Charset value", //$NON-NLS-1$
charset);
preferredCharsets.put(acceptCharsets, charset);
return charset;
}
Charset.forName(charset);
validCharsets.put(charset, Boolean.TRUE);
- logger.debug("getCharset() returning {} since highest Accept-Charset value",
+ logger.debug("getCharset() returning {} since highest Accept-Charset value", //$NON-NLS-1$
charset);
preferredCharsets.put(acceptCharsets, charset);
return charset;
} catch (IllegalCharsetNameException e) {
- logger.debug("IllegalCharsetNameException for {}", charset, e);
+ logger.debug("IllegalCharsetNameException for {}", charset, e); //$NON-NLS-1$
validCharsets.put(charset, Boolean.FALSE);
} catch (UnsupportedCharsetException e) {
- logger.debug("UnsupportedCharsetException for {}", charset, e);
+ logger.debug("UnsupportedCharsetException for {}", charset, e); //$NON-NLS-1$
validCharsets.put(charset, Boolean.FALSE);
} catch (IllegalArgumentException e) {
- logger.debug("IllegalArgumentException for {}", charset, e);
+ logger.debug("IllegalArgumentException for {}", charset, e); //$NON-NLS-1$
validCharsets.put(charset, Boolean.FALSE);
}
}
@@ -158,7 +158,7 @@ public class ProviderUtils {
// Accept-Charset header), or we only have banned charsets. If there are
// any banned charsets, then technically we should pick a non-banned
// charset.
- logger.debug("getCharset() returning {} since no explicit charset required",
+ logger.debug("getCharset() returning {} since no explicit charset required", //$NON-NLS-1$
DEFAULT_CHARSET);
preferredCharsets.put(acceptCharsets, DEFAULT_CHARSET);
return DEFAULT_CHARSET;
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=960918&r1=960917&r2=960918&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 Tue Jul 6 15:36:47 2010
@@ -16,218 +16,201 @@
# under the License.
# Class and Method Validation
-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 {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}.
-classIllegalAccessWithMsgFormat=Illegal access to {0}.
-loadingClassToApplication=Class {0} was added to application.
-loadingApplication=Loading application from {0}
+classNotAProvider=The {0} class is not a provider. The runtime is ignoring this class. Add a @javax.ws.rs.ext.Provider annotation to the class.
+classNotAResourceNorProvider=The {0} class is neither a resource nor a provider. The runtime is ignoring this class. Add either a @javax.ws.rs.Path or a @javax.ws.rs.core.Provider annotation to the class.
+classNotADynamicResourceNorResourceNorProvider=The {0} class is not a dynamic resource, resource, or provider. The runtime is ignoring this class. Add the appropriate JAX-RS annotation to this class.
+classAlreadyAdded=The class {0} was already added to the JAX-RS runtime. The runtime is ignoring this value. Check that this class was not returned in the javax.ws.rs.core.Application subclass getSingletons() and getClasses() methods.
+classNotValid=The class {0} can only have one of the following declarations: {1} {2} {3} . Ensure that the class has only one annotation.
+classIsUnknownProvider=The @javax.ws.rs.ext.Provider annotated class {0} does not implement a recognized Provider interface. Verify that the class implements javax.ws.rs.ext.ContextResolver, javax.ws.rs.ext.ExceptionMapper, javax.ws.rs.ext.MessageBodyReader, or javax.ws.rs.ext.MessageBodyWriter.
+isNotAClassWithMsgFormat=The {0} is not a class or the class has unresolved dependencies. The runtime is ignoring this value.
+resourceClassNotValid=The resource class {0} is not a valid resource. The runtime environment is ignoring this value. Ensure that the resource class has a @javax.ws.rs.Path annotation and that the annotation has a unique value.
+rootResourceInstanceIsAnInvalidResource=The root resource {0} instance is not a valid resource. Ensure that the resource instance has a @javax.ws.rs.Path annotation and that the annotation has a unique value.
+classInstantiationExceptionWithMsgFormat=The runtime environment failed to instantiate the {0} class. Ensure that the class is not abstract, has a valid constructor, has the right visibility, and is not an inner member class.
+classIllegalAccessWithMsgFormat=The runtime environment encountered an illegal access exception to {0}. Ensure that the class is not abstract, has a valid constructor, has the right visibility, and is not an inner member class.
+loadingClassToApplication=The class {0} was added to the application.
+loadingApplication=The runtime is loading the application from {0}
-exceptionOccurredDuringClassProcessing=An exception occurred during processing of class {0} Ignoring class.
+exceptionOccurredDuringClassProcessing=An exception occurred during processing of the {0} class. This class is ignored.
listExceptionDuringClassProcessing=The following exception occurred during processing of class:
-exceptionOccurredDuringSingletonProcessing=An exception occurred during processing of singleton {0} Ignoring singleton.
+exceptionOccurredDuringSingletonProcessing=An exception occurred during processing of the {0} singleton. This singleton is ignored
listExceptionDuringSingletonProcessing=The following exception occurred during processing of class:
-exceptionOccurredDuringInstanceProcessing=An exception occurred during processing of instance {0} Ignoring.
+exceptionOccurredDuringInstanceProcessing=An exception occurred during processing of the {0} instance. This instance is ignored.
listExceptionDuringInstanceProcessing=The following exception occurred during processing of instance:
-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
+methodNotAnnotatedCorrectly=The method {0} in the {1} class is not annotated with an HTTP method designator or the @javax.ws.rs.Path annotation. This method is ignored. Annotate this method with a single @javax.ws.rs.GET, @javax.ws.rs.POST, @javax.ws.rs.PUT, @javax.ws.rs.DELETE or any other @javax.ws.rs.HttpMethod annnotation if this method should be a JAX-RS resource method.
+subresourceLocatorIllegalEntityParameter=The {0} sub-resource locator contains an illegal entity parameter. The locator is ignored. Remove the entity parameter from the sub-resource locator method definition.
+subresourceLocatorAnnotatedConsumesProduces=The {0} sub-resource locator is annotated with @javax.ws.rs.Consumes/@javax.ws.rs.Produces. These annotations are ignored for sub-resource locators.
# Loading config
-configNotFound=Could not find {0} Ignoring.
-exceptionClosingFile=Exception when closing file
-propertyNotDefined={0} property was not defined.
-alternateShortcutMapLoadFailure=Failed to load alternateShortcutMap
-alternateShortcutMapCloseFailure=Exception when closing file:
+configNotFound=The system could not find {0}. This value is ignored.
+exceptionClosingFile=An exception occured when closing a file.
+propertyNotDefined=The {0} property was not defined.
+alternateShortcutMapLoadFailure=The system failed to load the alternateShortcutMap.
+alternateShortcutMapCloseFailure=An exception occurred when closing the file:
# Provider Information
-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
+uploadDirDoesNotExist=The upload directory {0} does not exist or is not a directory. The entity is uploaded to a default temporary directory defined by the JVM system property "java.io.tmpdir". Create the upload directory and verify that the file permissions are set appropriately.
+cannotUseFileAsResponse=The system cannot read the {0} file to server as a HTTP response. The file is not readable or is a directory. Verify that the file exists and the correct file permissions are set.
-jaxbObjectFactoryInstantiate=Failed to instantiate object factory for {0}
+jaxbObjectFactoryInstantiate=The system failed to instantiate the object factory for the following class: {0}.
# internals
-mediaTypeSetAlreadyContains=The set already contains {0} Skipping...
-invalidServletContextAccessor={0} must be javax.servlet.http.HttpServletRequest or javax.servlet.http.HttpServletResponse.
+mediaTypeSetAlreadyContains=The internal Providers MediaTypeSet already contains the {0} ObjectFactory. This internal warning may be ignored.
+invalidServletContextAccessor=The context access for the {0} attribute must be for either javax.servlet.http.HttpServletRequest or javax.servlet.http.HttpServletResponse.
# writing
-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.
+noWriterOrDataSourceProvider=The system could not find a javax.ws.rs.ext.MessageBodyWriter or a DataSourceProvider class for the {0} type and {1} mediaType. Ensure that a javax.ws.rs.ext.MessageBodyWriter exists in the JAX-RS application for the type and media type specified.
+noWriterFound=The system could not find a javax.ws.rs.ext.MessageBodyWriter for the {0} type and {1} mediaType.
# Spring
-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:
+springClassReplaceNewerObjectFactory=The {0} object factory was replaced with a newer object factory.
+springBeanClassNotDynamicResource=The {0} bean of the {1} class is not a DynamicResource. Verify that the class implements the org.apache.wink.common.DynamicResource interface.
+springBeanNotResourceNorProvider=The {0} bean of the {1} class is neither a resource nor a provider. Add the appropriate JAX-RS annotation such as @javax.ws.rs.Path or @javax.ws.rs.ext.Provider to make the bean a resource or provider.
+springExceptionOccurredDuringFieldInject=An exception occured during the fields injection for the following bean:
# Injection
-injectionFailureSingleton=Failed to inject fields of singleton {0}
+injectionFailureSingleton=The system cannot inject the fields of the {0} singleton bean.
# Asset Provider
-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 {0}
-atomRequestEntityNotAtomFeed=Request entity is not an atom feed (it was unmarshalled as {0}
+assetLocatorMethodMoreThanOneEntityParam=The {0} asset locator method has more than one entity parameter. You must use only one entity parameter.
+assetMethodInvokeError=An error occurred when the system invoked the {0} asset method.
+assetMustHavePublicConstructor=The {0} asset cannot be instantiated. Verify that your assets have a default public constructor defined.
+assetCannotInstantiate=The {0} asset cannot be instantiated.
# 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 {0} to JSONObject
-jsonFailWriteJSONObject=Failed to write JSONObject
-jsonFailReadJSONObject=Failed to read JSONObject
-jsonFailWriteJSONArray=Failed to write JSONArray
-jsonFailReadJSONArray=Failed to read JSONArray
+jsonFailWriteJSONObject=The system cannot write the JSONObject to the HTTP response. Verify that the JSONObject is valid.
+jsonFailReadJSONObject=The system cannot read the JSONObject from the HTTP request. Verify that the incoming HTTP request contains valid JSON.
+jsonFailWriteJSONArray=The system cannot write the JSONArray to the HTTP response. Verify that the JSONArray is valid.
+jsonFailReadJSONArray=The system cannot read the JSONArray from the HTTP request. Verify that the incoming HTTP request contains valid JSON.
# JAXB Provider
-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}
+jaxbObjectFactoryNotFound=The ObjectFactory class for the {0} class cannot be found or loaded. Verify that a valid ObjectFactory class exists.
+jaxbElementFailToBuild=A JAXBElement for {0} could not be created. Verify that {0} is a valid JAXB class.
+jaxbObjectFactoryNotAnnotatedXMLRegistry=The {0} ObjectFactory is not annotated with @javax.xml.bind.annotation.XmlRegistry. Add the XmlRegistry annotation to the ObjectFactory.
+jaxbFailToUnmarshal=The system cannot unmarshal the XML content into a {0} instance. Verify that the XML content is valid.
+jaxbFailToMarshal=The system cannot marshal the {0} JAXB object into XML content. Verify that the JAXB object is valid.
+jaxbCreateDefaultJAXBElement=The system created a default JAXBElement for the {0} instance.
# Failure Messages
-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={0} occurred during the handlers chain invocation
+mediaTypeWrongFormat=The {0} is not a valid MediaType format. You must use the following format: type/subtype.
+unhandledExceptionToContainer=An unhandled exception occurred which will be propagated to the container.
+exceptionOccurredDuringInvocation=The following error occurred during the invocation of the handlers chain: {0}
# Contexts
-uriBadBaseURI=Bad base URI: {0}
+uriBadBaseURI=The following base URI is not valid: {0}
# Error Flow
-exceptionOccurredDuringExceptionMapper=Exception occurred while executing toResponse of the ExceptionMapper
+exceptionOccurredDuringExceptionMapper=An exception occurred while processing the toResponse method of the ExceptionMapper.
# WebDAV
-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 {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}
+webDAVNoEditOrSelfLink=The {0} resource did not set an edit or selflink.
+webDAVFailSetupPropertyHelper=The system cannot setup a property helper.
+webDAVFailCreateMarshaller=The system cannot created the WebDAV marshaller.
+webDAVFailCreateUnmarshaller=The system cannot create the WebDAV unmarshaller.
+webDAVUnableToParseElement=The system cannot parse the {0} the WebDAV element.
+webDAVIncompatibleTypeInRequest=The {0} WebDAV element contains in incompatible type. The {1} type was received but the {2} type was requested.
+webDAVUnableToMarshalElement=The system cannot marshal the {0} WebDAV element.
+
+noMethodInClassSupportsHTTPMethod=The system cannot find any method in the {0} class that supports {1}. Verify that a method exists.
+noMethodInClassConsumesHTTPMethod=The system cannot find any method in the {0} class that consumes {1} media type. Verify that a method exists that consumes the media type specified.
+noMethodInClassProducesHTTPMethod=The system cannot find any method in the {0} class that produces {1} media type responses. Verify that a method exists that produces the media type specified.
# Client Handler
-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 {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.
+clientIssueRequest=The client issued a request with {0} HTTP method to the URI at {1} with the {2} entity class and {3} headers.
+clientAcceptHeaderHandlerSetAccept=The accept header is automatically set to the following value: {0}
+clientResponseIsErrorCode=The client response returned the following error code: {0}
+clientConfigurationUnmodifiable=The client configuration cannot be modified because it is in use by a client. A new client configuration must be constructed to modify the client configuration.
+entityTypeMustBeParameterized=The EntityType class must be parameterized. Add a generic parameter to the EntityType.
+clientNoWriterForTypeAndMediaType=A javax.ws.rs.ext.MessageBodyWriter implementation was not found for the {0} type and {1} media type. Verify that all entity providers are correctly registered. Add a custom javax.ws.rs.ext.MessageBodyWriter provider to handle the type and media type if a JAX-RS entity provider does not currently exist.
+clientCannotConvertEntity=An entity of {0} type cannot be cast as the following type: {1}
+clientNoReaderForTypeAndMediaType=A javax.ws.rs.ext.MessageBodyReader implementation was not found for {0} type and {1} media type. Verify that all entity providers are correctly registered. Add a custom javax.ws.rs.ext.MessageBodyReader provider to handle the type and media type if a JAX-RS entity provider does not currently exist.
# Server Handlers
-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.
+checkLocationHeaderHandlerIllegalArg=The required Location header was not set for the following status code: {0}
+populateResponseMediaTypeHandlerFromCompatibleMessageBodyWriters=The Content-Type header was not specified on the javax.ws.rs.core..Response object or using a @javax.ws.rs.Produces annotation. Therefore, the Content-Type was automatically set using the compatible javax.ws.rs.ext.MessageBodyWriter providers.
+populateResponseMediaTypeHandlerNoAcceptableResponse=The client did not list any compatible media types in the Accept request header. The service is automatically sending a HTTP 406 Not Acceptable response to the client.
# Servlet/Filter Messages
-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 {0}
+restServletJAXRSApplicationInitParam=The system is using the {0} application class {0} that is named in the {1} init-param initialization parameter.
+restServletWinkApplicationInitParam=The system is using the {0} application class named in the {1} init-param initialization parameter.
+restServletUseDeploymentConfigurationParam=The system is using the {0} deployment configuration class named in the {1} init-param initialization parameter.
+restServletUsePropertiesFileAtLocation=The system is using the properties file located at {0} named in the {1} init-param initialization parameter.
+restServletRequestProcessorCouldNotBeCreated=The system cannot create the RequestProcessor. Verify that the application configuration is correct.
+adminServletRequestProcessorInitBeforeAdmin=The request processor cannot be initialized. Verify that you initialization the request processor before calling the AdminServlet.
+adminServletFailCreateJAXBForAdminServlet=The JAXBContext for the AdminServlet class cannot be created. Verify that the required libraries are available.
+adminServletFailMarshalObject=The {0} object cannot be marshaled from JAXB into XML content. Verify that the required libraries are available.
# Server
-cannotGetOutputStreamSinceWriterRequested=Cannot get OutputStream since Writer already requested.
-writerCannotGetWriterSinceOutputStreamRequested=Cannot get Writer since OutputStream already requested.
-rootResourceCollectionListIsNull=CollectionList is null.
-
-parameterHttpsIsEmptyOrNotInitialized=Parameter httpsURI is empty or not initialized
-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.
+cannotGetOutputStreamSinceWriterRequested=The system cannot obtain the java.io.OutputStream because a java.io.Writer was already requested. Verify that no java.io.Writer was requested before the java.io.OutputStream.
+writerCannotGetWriterSinceOutputStreamRequested=The system cannot obtain the java.io.Writer since a java.io.OutputStream was already requested. Verify that no java.io.OutputStream was requested before the java.io.Writer.
+rootResourceCollectionListIsNull=The CollectionList is null. Verify that the application was correctly configured.
+
+parameterHttpsIsEmptyOrNotInitialized=The httpsURI parameter is empty or it is not initialized.
+parameterHttpIsEmptyOrNotInitialized=The httpURI parameter is empty or it is not initialized.
+uriInfoInvalidURI=A URI was specified with syntax that is not valid. Verify that the URI is valid.
+methodCallOutsideScopeOfRequestContext=A method call was made outside the scope of a request context. Verify that the method is called within the context of a JAX-RS request.
# 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 variablemultiPartStreamAlreadyClosed=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.
-providerIsInterfaceOrAbstract=@javax.ws.rs.ext.Provider found on interface or abstract class {0} and is being ignored. Annotate @javax.ws.rs.ext.Provider on the provider implementation or base class directly and return that in your javax.ws.rs.core.Application subclass.
+methodCannotHandleType=The method cannot handle {0}.
+missingVariable=The {0} variable is missing. Verify that null is not being passed in.
+valueAtIndexIsNull=The value argument at {0} index is null. Verify that the argument at the index specified is not null.
+variableIsEmpty=The {0} variable is empty. Verify that the variable is not empty.
+resourceNotAnnotated=The resource is not annotated with the {0} annotation.
+methodNotAnnotated=The method is not annotated with the {0} annotation.
+moreThanOneMethodAnnotated=There is more than one method with the {0} annotation. Verify that the annotation is correctly annotated.
+noMethodAnnotated=A method with the {0} annotation does not exist.
+invalidPort=The port is not valid. Verify that the port specified was correct.
+isInvalid=The {0} value is invalid.
+segmentAtIndexIsNull=The segment at the {0} index is null.
+variableIsNull=The value of the {0} variable is null.
+variableNotSuppliedAValue=The {0} variable was not supplied a value. Provide a value for this variable.
+patternNotCompiled=The pattern not compiled.
+syntaxErrorInvalidTemplateForm=The {0} value contains a syntax error that results in an invalid template form. Verify that the value is a valid template.
+valueFromMethodMustBeType=The value that is returned from the {0} method must be of the following type: {1}
+notASupportedResourceMethodParam=The {0} type is not a supported resource method parameter.
+cannotConvertValueFromTo=The system cannot convert the {0} value to {1}.
+cannotCreateFactoryForClass=A factory for the {0} class cannot be created.
+cannotCreateDefaultFactoryForDR=The default factory for the {0} DynamicResource cannot be created.
+cannotCreateDefaultFactoryFor=iThe default factory for the {0} class cannot be created.
+cookieCannotContainAddlVers=The cookie cannot contain an additional $Version value: {0}
+cookieMustStartWithVersion=The cookie must start with a $Version: {0}
+cookieDoesNotContainNAMEVALUE=The {0} cookie does not contain a NAME+VALUE.
+failedToParseCookie=The {0} cookie cannot be parsed.
+invalidCookie=The {0} cookie is not valid.
+jaxrsCacheControlTypeSupport=The JAX-RS CacheControl type is designed to support only cache-response-directives
+headerIsNull=The {0} header is null.
+cookieIsNull=The cookie is null.
+cookieNameNotValid=The {0} name of the cookie is not valid.
+cookieNameValueNotValid=The {0} value for the cookie is not valid.
+entityTagNotQuoted=The syntax of the {0} entity tag is not specified correctly. The entity tag must be quoted.
+cannotMixInlineAndOutOfLine=Do not mix attributes for both inline and out-of-line categories.
+failedToCreateJAXBContextFor=The JAXBContext cannot be created for {0}.
+contentMayHaveInlineOrOutContent=The content element might have either inline or out-of-line content.
+typeAttribMustHaveValidMimeType=The type attribute of the content element must be a valid mime type when the content is out-of-line.
+noValidConstructorFoundFor=A valid constructor could not be found {0}.
+unsupportedOperator=The {0} is an unsupported operator.
+errorSettingUpAtom=An error occurred setting up the Atom JAXB utilities: {0}
+errorOccurredProcessingRequest=An error occurred while processing a request.
+conflictingParameterAnnotations=There are conflicting parameter annotations for {0}. Be sure that the parameter has the correct annotations.
+couldNotFindWriter=The system could not find a writer for {0} and {1}. Locate a DataSourceProvider for the JavaBeans Activation Framework (JAF).
+cannotCastTo=The system cannot cast {0} to {1}.
+mediaTypeHeaderNull=The MediaType header is null.
+multiPartStreamAlreadyClosed=The stream is already closed. The PartInputStream is not accessible after moving to the next part.
+lastMatchWasUnsuccessful=The last match was unsuccessful.
+variableContainsMoreThanOneValueForJoinOperator=The {0} variable contains more than one value for the 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 have only one variable.
+prefixOperatorMustHaveOnlyOneVariable=The prefix operator must have only one variable.
+missingClientAuthenticationCredentialForUser=The client authentication is missing a credential for user: {0}
+serviceFailedToAuthenticateUser=The service failed to authenticate user: {0}
+providerShouldBeAnnotatedDirectly=The @javax.ws.rs.ext.Provider annotation was found on a superclass or interface on the {0} class. Annotate @javax.ws.rs.ext.Provider on the provider class directly to ensure portability between environments.
+rootResourceShouldBeAnnotatedDirectly=The @javax.ws.rs.Path annotation was found on a superclass or interface on the {0} class. Annotate @javax.ws.rs.Path on the root resource class directly to ensure portability between environments.
+providerIsInterfaceOrAbstract=A @javax.ws.rs.ext.Provider annotation was found on {0} which is an interface or an abstract class and is being ignored. Annotate @javax.ws.rs.ext.Provider on the provider implementation or base class directly and return that in your javax.ws.rs.core.Application subclass.
entityRefsNotSupported=Entity references are not supported in XML documents due to possible security vulnerabilities.
saxParseException=The system cannot parse the XML content into a {0} instance. Verify that the XML content is valid.
saxParserConfigurationException=The system cannot configure the SAX parser with the given configuration parameter.
badXMLReaderInitialStart=The XMLStreamReader instance has already been partially processed.
+multipleHttpMethodAnnotations=Multiple http method annotations on method {0} in class {1}
+resourceMethodMoreThanOneEntityParam=The {0} method has more than one entity parameter. You must use only one entity parameter.