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:19:28 UTC
svn commit: r918543 - in /incubator/wink/trunk:
wink-client/src/main/java/org/apache/wink/client/
wink-client/src/main/java/org/apache/wink/client/internal/
wink-client/src/main/java/org/apache/wink/client/internal/handlers/
wink-common/src/main/java/o...
Author: jramos
Date: Wed Mar 3 16:19:27 2010
New Revision: 918543
URL: http://svn.apache.org/viewvc?rev=918543&view=rev
Log:
Update messages to use Messages.getMessage()
Modified:
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java
incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java
incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/model/app/AppTest.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/WebDAVModelHelper.java
incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/RestClient.java Wed Mar 3 16:19:27 2010
@@ -57,15 +57,11 @@
*/
public class RestClient {
- private static final Logger logger =
- LoggerFactory
- .getLogger(RestClient.class);
+ private static final Logger logger = LoggerFactory.getLogger(RestClient.class);
private ProvidersRegistry providersRegistry;
private ClientConfig config;
- private final static String CLASS_NOT_A_PROVIDER_MSG = Messages.getMessage("classNotAProvider");
-
/**
* Construct a new RestClient using the default client configuration
*/
@@ -153,15 +149,16 @@
try {
providersRegistry.addProvider(cls);
} catch (Exception e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringClassProcessing"), cls);
+ logger.warn(Messages.getMessage("exceptionOccurredDuringClassProcessing", //$NON-NLS-1$
+ cls));
logger.warn(Messages.getMessage("listExceptionDuringClassProcessing"), e);
} catch (NoClassDefFoundError e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringClassProcessing"), cls
- .getCanonicalName());
+ logger.warn(Messages.getMessage("exceptionOccurredDuringClassProcessing", //$NON-NLS-1$
+ cls.getCanonicalName()));
logger.warn(Messages.getMessage("listExceptionDuringClassProcessing"), e);
}
} else {
- logger.warn(CLASS_NOT_A_PROVIDER_MSG, cls);
+ logger.warn(Messages.getMessage("classNotAProvider", cls)); //$NON-NLS-1$
}
}
}
@@ -173,16 +170,16 @@
try {
providersRegistry.addProvider(obj);
} catch (Exception e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing"),
- obj.getClass().getCanonicalName());
+ logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing",
+ obj.getClass().getCanonicalName()));
logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e);
} catch (NoClassDefFoundError e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing"),
- obj.getClass().getCanonicalName());
+ logger.warn(Messages.getMessage("exceptionOccurredDuringSingletonProcessing",
+ obj.getClass().getCanonicalName()));
logger.warn(Messages.getMessage("listExceptionDuringSingletonProcessing"), e);
}
} else {
- logger.warn(CLASS_NOT_A_PROVIDER_MSG, obj);
+ logger.warn(Messages.getMessage("classNotAProvider", obj));
}
}
}
@@ -200,16 +197,16 @@
try {
providersRegistry.addProvider(obj, priority);
} catch (Exception e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringInstanceProcessing"),
- obj.getClass().getCanonicalName());
+ logger.warn(Messages.getMessage("exceptionOccurredDuringInstanceProcessing",
+ obj.getClass().getCanonicalName()));
logger.warn(Messages.getMessage("listExceptionDuringInstanceProcessing"), e);
} catch (NoClassDefFoundError e) {
- logger.warn(Messages.getMessage("exceptionOccurredDuringInstanceProcessing"),
- obj.getClass().getCanonicalName());
+ logger.warn(Messages.getMessage("exceptionOccurredDuringInstanceProcessing",
+ obj.getClass().getCanonicalName()));
logger.warn(Messages.getMessage("listExceptionDuringInstanceProcessing"), e);
}
} else {
- logger.warn(CLASS_NOT_A_PROVIDER_MSG, obj);
+ logger.warn(Messages.getMessage("classNotAProvider", cls));
}
}
}
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/ResourceImpl.java Wed Mar 3 16:19:27 2010
@@ -243,8 +243,8 @@
request.getHeaders().putAll(headers);
if (logger.isDebugEnabled()) {
Integer requestEntityInfo = (requestEntity == null) ? null : System.identityHashCode(requestEntity);
- logger.debug(Messages.getMessage("clientIssueRequest"), new Object[] {method,
- requestURI, requestEntityInfo, headers.keySet()});
+ logger.debug(Messages.getMessage("clientIssueRequest", new Object[] {method,
+ requestURI, requestEntityInfo, headers.keySet()}));
}
if (headers.getFirst(HttpHeaders.USER_AGENT) == null) {
request.getHeaders().add(HttpHeaders.USER_AGENT, USER_AGENT);
Modified: incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java (original)
+++ incubator/wink/trunk/wink-client/src/main/java/org/apache/wink/client/internal/handlers/AcceptHeaderHandler.java Wed Mar 3 16:19:27 2010
@@ -68,8 +68,8 @@
if (acceptHeader.length() > 0) {
String acceptValue = acceptHeader.toString();
requestHeaders.add(HttpHeaders.ACCEPT, acceptValue);
- logger.info(Messages.getMessage("clientAcceptHeaderHandlerSetAccept"),
- acceptValue);
+ logger.info(Messages.getMessage("clientAcceptHeaderHandlerSetAccept",
+ acceptValue));
}
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationFileLoader.java Wed Mar 3 16:19:27 2010
@@ -72,7 +72,7 @@
FileLoader.loadFileUsingClassLoaders(WINK_APPLICATION);
while (applications.hasMoreElements()) {
URL url = applications.nextElement();
- logger.info(Messages.getMessage("loadingApplication"), url.toExternalForm());
+ logger.info(Messages.getMessage("loadingApplication", url.toExternalForm()));
loadClasses(url.openStream());
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/ApplicationValidator.java Wed Mar 3 16:19:27 2010
@@ -81,7 +81,7 @@
private boolean classUnique(Class<? extends Object> cls) {
if (!singletonClasses.add(cls)) {
// the singleton of this class already exists
- logger.warn(Messages.getMessage("classAlreadyAdded"), cls);
+ logger.warn(Messages.getMessage("classAlreadyAdded", cls));
return false;
}
return true;
@@ -108,9 +108,9 @@
boolean valid = counter <= 1;
if (!valid) {
- logger.warn(Messages.getMessage("classNotValid"),
+ logger.warn(Messages.getMessage("classNotValid",
new Object[] {cls, Path.class.getName(), DynamicResource.class.getName(),
- Provider.class.getName()});
+ Provider.class.getName()}));
}
return valid;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/application/SimpleWinkApplication.java Wed Mar 3 16:19:27 2010
@@ -79,7 +79,7 @@
.addAll(getApplicationFileLoader(getFileStream(applicationConfigFile))
.getClasses());
} catch (FileNotFoundException e) {
- logger.warn(Messages.getMessage("configNotFound"), applicationConfigFile);
+ logger.warn(Messages.getMessage("configNotFound", applicationConfigFile));
}
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/lifecycle/LifecycleManagerUtils.java Wed Mar 3 16:19:27 2010
@@ -42,10 +42,10 @@
CreationUtils.injectFields(object, classMetadata, null);
return new SingletonObjectFactory<T>(object);
} catch (IOException e) {
- logger.error(Messages.getMessage("injectionFailureSingleton"), cls);
+ logger.error(Messages.getMessage("injectionFailureSingleton", cls));
throw new ObjectCreationException(e);
} catch (PrivilegedActionException e) {
- logger.error(Messages.getMessage("injectionFailureSingleton"), cls);
+ logger.error(Messages.getMessage("injectionFailureSingleton", cls));
throw new ObjectCreationException(e);
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/AnyContentHandler.java Wed Mar 3 16:19:27 2010
@@ -82,7 +82,7 @@
(MessageBodyWriter<Object>)providers.getMessageBodyWriter(cls, cls, null, type);
if (writer == null) {
- logger.error(Messages.getMessage("noWriterFound"), cls.getName(), type.toString());
+ logger.error(Messages.getMessage("noWriterFound", cls.getName(), type.toString()));
throw new WebApplicationException(500);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/model/ModelUtils.java Wed Mar 3 16:19:27 2010
@@ -40,7 +40,6 @@
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Providers;
-import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
@@ -78,22 +77,18 @@
public class ModelUtils {
- public static final MultivaluedMap<String, Object> EMPTY_OBJECT_MAP =
- new UnmodifiableMultivaluedMap<String, Object>(
- new MultivaluedMapImpl<String, Object>());
- public static final MultivaluedMap<String, String> EMPTY_STRING_MAP =
- new UnmodifiableMultivaluedMap<String, String>(
- new MultivaluedMapImpl<String, String>());
- public static final Annotation[] EMPTY_ARRAY = new Annotation[0];
+ public static final MultivaluedMap<String, Object> EMPTY_OBJECT_MAP =
+ new UnmodifiableMultivaluedMap<String, Object>(
+ new MultivaluedMapImpl<String, Object>());
+ public static final MultivaluedMap<String, String> EMPTY_STRING_MAP =
+ new UnmodifiableMultivaluedMap<String, String>(
+ new MultivaluedMapImpl<String, String>());
+ public static final Annotation[] EMPTY_ARRAY = new Annotation[0];
private final static SAXParserFactory spf;
private final static DatatypeFactory datatypeFactory;
- private static final Logger logger =
- LoggerFactory
- .getLogger(ModelUtils.class);
-
- private final static String CLASS_NOT_A_PROVIDER_MSG =
- Messages
- .getMessage("classNotAProvider");
+ private static final Logger logger =
+ LoggerFactory
+ .getLogger(ModelUtils.class);
static {
try {
@@ -218,7 +213,7 @@
Annotation[] annotations,
MultivaluedMap<String, String> httpHeaders,
MediaType mediaType) throws IOException {
-
+
if (list == null || list.isEmpty()) {
return null;
}
@@ -297,14 +292,16 @@
providers = new ProvidersImpl(providersRegistry, runtimeContext);
}
}
-
+
/*
- * Need to set a temporary RuntimeContextTLS just in case we're already outside of the runtime context.
- * This may occur when a client app is retrieving the AtomContent value, expecting it to be unmarshalled
- * automatically, but we are already outside of the client-server thread, and thus no longer have a
- * RuntimeContextTLS from which to retrieve or inject providers.
+ * Need to set a temporary RuntimeContextTLS just in case we're
+ * already outside of the runtime context. This may occur when a
+ * client app is retrieving the AtomContent value, expecting it to
+ * be unmarshalled automatically, but we are already outside of the
+ * client-server thread, and thus no longer have a RuntimeContextTLS
+ * from which to retrieve or inject providers.
*/
-
+
RuntimeContext tempRuntimeContext = RuntimeContextTLS.getRuntimeContext();
if (tempRuntimeContext == null) {
final Providers p = providers;
@@ -322,7 +319,7 @@
}
});
}
-
+
MessageBodyReader<T> reader =
providers.getMessageBodyReader(type, type, EMPTY_ARRAY, mediaType);
if (reader == null)
@@ -428,7 +425,7 @@
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(cls);
} else {
- logger.warn(CLASS_NOT_A_PROVIDER_MSG, cls);
+ logger.warn(Messages.getMessage("classNotAProvider", cls));
}
}
}
@@ -440,7 +437,7 @@
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj);
} else {
- logger.warn(CLASS_NOT_A_PROVIDER_MSG, obj);
+ logger.warn(Messages.getMessage("classNotAProvider", obj.getClass()));
}
}
}
@@ -458,7 +455,7 @@
if (ProviderMetadataCollector.isProvider(cls)) {
providersRegistry.addProvider(obj, priority);
} else {
- logger.warn(CLASS_NOT_A_PROVIDER_MSG, obj);
+ logger.warn(Messages.getMessage("classNotAProvider", obj.getClass()));
}
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/AssetProvider.java Wed Mar 3 16:19:27 2010
@@ -113,20 +113,20 @@
httpHeaders,
entityStream);
} catch (IllegalArgumentException e) {
- logger.error(Messages.getMessage("assetMethodInvokeError"), method.getMethod()
- .getName());
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName()));
throw new WebApplicationException(e);
} catch (IllegalAccessException e) {
- logger.error(Messages.getMessage("assetMethodInvokeError"), method.getMethod()
- .getName());
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName()));
throw new WebApplicationException(e);
} catch (InvocationTargetException e) {
Throwable targetException = e.getTargetException();
if (targetException instanceof RuntimeException) {
throw (RuntimeException)targetException;
}
- logger.error(Messages.getMessage("assetMethodInvokeError"), method.getMethod()
- .getName());
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName()));
throw new WebApplicationException(targetException);
}
}
@@ -171,16 +171,16 @@
if (targetException instanceof RuntimeException) {
throw (RuntimeException)targetException;
}
- logger.error(Messages.getMessage("assetMethodInvokeError"), method.getMethod()
- .getName());
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName()));
throw new WebApplicationException(e);
} catch (InstantiationException e) {
- logger.error(Messages.getMessage("assetMustHavePublicConstructor"), type.getName());
+ logger.error(Messages.getMessage("assetMustHavePublicConstructor", type.getName()));
throw new WebApplicationException(e);
} catch (Exception e) {
- logger.error(Messages.getMessage("assetMethodInvokeError"), method.getMethod()
- .getName());
+ logger.error(Messages
+ .getMessage("assetMethodInvokeError", method.getMethod().getName()));
throw new WebApplicationException(e);
}
}
@@ -228,14 +228,14 @@
// verify that the asset has a default public constructor
try {
if (assetType.getConstructor() == null) {
- logger.info(Messages.getMessage("assetCannotInstantiate"), assetType.getName());
+ logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName()));
return false;
}
} catch (SecurityException e) {
- logger.info(Messages.getMessage("assetCannotInstantiate"), assetType.getName());
+ logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName()));
return false;
} catch (NoSuchMethodException e) {
- logger.info(Messages.getMessage("assetCannotInstantiate"), assetType.getName());
+ logger.info(Messages.getMessage("assetCannotInstantiate", assetType.getName()));
return false;
}
@@ -416,7 +416,7 @@
String methodName =
method.getDeclaringClass().getName() + "." + method.getName();
logger.error(Messages
- .getMessage("assetLocatorMethodMoreThanOneEntityParam"), methodName);
+ .getMessage("assetLocatorMethodMoreThanOneEntityParam", methodName));
throw new WebApplicationException();
}
type = fp.getGenericType();
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/FileProvider.java Wed Mar 3 16:19:27 2010
@@ -108,7 +108,7 @@
dir = new File(uploadDir);
if (!dir.exists() || !dir.isDirectory()) {
dir = null;
- logger.warn(Messages.getMessage("uploadDirDoesNotExist"), uploadDir);
+ logger.warn(Messages.getMessage("uploadDirDoesNotExist", uploadDir));
throw new WebApplicationException();
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBCollectionProvider.java Wed Mar 3 16:19:27 2010
@@ -108,12 +108,12 @@
releaseJAXBUnmarshaller(context, unmarshaller);
return ret;
} catch (XMLStreamException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName()); // TODO
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), e); // TODO
// change
// message
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), e);
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
}
@@ -170,7 +170,7 @@
writeEndTag(qname, entityStream);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToMarshal", type.getName()), e);
throw new WebApplicationException(e);
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/AbstractJAXBProvider.java Wed Mar 3 16:19:27 2010
@@ -279,7 +279,7 @@
if (!isXMLRootElement(type) && isXMLType(type)) {
JAXBElement<?> wrappedJAXBElement = wrapInJAXBElement(jaxbObject, type);
if (wrappedJAXBElement == null) {
- logger.error(Messages.getMessage("jaxbObjectFactoryNotFound"), type.getName());
+ logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", type.getName()));
throw new WebApplicationException();
}
return wrappedJAXBElement;
@@ -311,10 +311,10 @@
}
return null;
}
- logger.warn(Messages.getMessage("jaxbObjectFactoryInstantiate"), type.getName());
+ logger.warn(Messages.getMessage("jaxbObjectFactoryInstantiate", type.getName()));
return defaultWrapInJAXBElement(jaxbObject, type);
} catch (Exception e) {
- logger.error(Messages.getMessage("jaxbElementFailToBuild"), type.getName());
+ logger.error(Messages.getMessage("jaxbElementFailToBuild", type.getName()));
return null;
}
@@ -334,13 +334,13 @@
try {
factoryClass = Thread.currentThread().getContextClassLoader().loadClass(b.toString());
} catch (ClassNotFoundException e) {
- logger.error(Messages.getMessage("jaxbObjectFactoryNotFound"), type.getName());
+ logger.error(Messages.getMessage("jaxbObjectFactoryNotFound", type.getName()));
return null;
}
if (!factoryClass.isAnnotationPresent(XmlRegistry.class)) {
- logger.error(Messages.getMessage("jaxbObjectFactoryNotAnnotatedXMLRegistry"), type
- .getName());
+ logger.error(Messages.getMessage("jaxbObjectFactoryNotAnnotatedXMLRegistry", type
+ .getName()));
return null;
}
@@ -349,7 +349,7 @@
@SuppressWarnings("unchecked")
private JAXBElement<?> defaultWrapInJAXBElement(Object jaxbObject, Class<?> type) {
- logger.info(Messages.getMessage("jaxbCreateDefaultJAXBElement"), type.getName());
+ logger.info(Messages.getMessage("jaxbCreateDefaultJAXBElement", type.getName()));
String typeStr = type.getAnnotation(XmlType.class).name();
return new JAXBElement(new QName(typeStr), type, jaxbObject);
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBElementXmlProvider.java Wed Mar 3 16:19:27 2010
@@ -93,7 +93,7 @@
releaseJAXBUnmarshaller(context, unmarshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), e);
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -131,7 +131,7 @@
releaseJAXBMarshaller(context, marshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal"), t.getName());
+ logger.error(Messages.getMessage("jaxbFailToMarshal", t.getName()), e);
throw new WebApplicationException(e, Response.Status.INTERNAL_SERVER_ERROR);
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/providers/entity/xml/JAXBXmlProvider.java Wed Mar 3 16:19:27 2010
@@ -90,7 +90,7 @@
releaseJAXBUnmarshaller(context, unmarshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToUnmarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToUnmarshal", type.getName()), e);
throw new WebApplicationException(e, Response.Status.BAD_REQUEST);
}
return unmarshaledResource;
@@ -128,7 +128,7 @@
releaseJAXBMarshaller(context, marshaller);
} catch (JAXBException e) {
- logger.error(Messages.getMessage("jaxbFailToMarshal"), type.getName());
+ logger.error(Messages.getMessage("jaxbFailToMarshal", type.getName()), e);
throw new WebApplicationException(e);
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/ProvidersRegistry.java Wed Mar 3 16:19:27 2010
@@ -157,7 +157,7 @@
retValue = true;
}
if (retValue == false) {
- logger.warn(Messages.getMessage("classIsUnknownProvider"), cls);
+ logger.warn(Messages.getMessage("classIsUnknownProvider", cls));
}
return retValue;
@@ -640,7 +640,7 @@
}
copyOfMap.put(key, set);
if (!set.add(objectFactory)) {
- logger.warn(Messages.getMessage("mediaTypeSetAlreadyContains"), objectFactory);
+ logger.warn(Messages.getMessage("mediaTypeSetAlreadyContains", objectFactory));
} else {
// need to resort the entry set
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=918543&r1=918542&r2=918543&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:19:27 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();
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/UriInfoImpl.java Wed Mar 3 16:19:27 2010
@@ -103,7 +103,7 @@
try {
baseUri = new URI(baseUriString);
} catch (URISyntaxException e) {
- logger.error(Messages.getMessage("uriBadBaseURI") + baseUriString, e);
+ logger.error(Messages.getMessage("uriBadBaseURI", baseUriString), e);
}
}
logger.debug("getBaseUri() returning: {}", baseUri);
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/handlers/FlushResultHandler.java Wed Mar 3 16:19:27 2010
@@ -205,8 +205,8 @@
.createDataContentHandler(responseMediaType.toString());
if (dataContentHandler == null) {
- logger.error(Messages.getMessage("noWriterOrDataSourceProvider"), entity.getClass()
- .getName(), responseMediaType);
+ logger.error(Messages.getMessage("noWriterOrDataSourceProvider", entity.getClass()
+ .getName(), responseMediaType));
throw new WebApplicationException(500);
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/registry/ResourceRegistry.java Wed Mar 3 16:19:27 2010
@@ -121,7 +121,7 @@
writersLock.lock();
try {
if (!applicationValidator.isValidResource(instance.getClass())) {
- logger.warn(Messages.getMessage("resourceClassNotValid"), instance);
+ logger.warn(Messages.getMessage("resourceClassNotValid", instance.getClass()));
return;
}
@@ -146,7 +146,7 @@
writersLock.lock();
try {
if (!applicationValidator.isValidResource(clazz)) {
- logger.warn(Messages.getMessage("resourceClassNotValid"), clazz);
+ logger.warn(Messages.getMessage("resourceClassNotValid", clazz));
return;
}
ResourceRecord record = getRecord(clazz);
@@ -435,8 +435,8 @@
}
}
if (methodRecords.size() == 0) {
- logger.info(Messages.getMessage("noMethodInClassConsumesHTTPMethod"), resource
- .getResourceClass().getName(), context.getHttpHeaders().getMediaType());
+ logger.info(Messages.getMessage("noMethodInClassConsumesHTTPMethod", resource
+ .getResourceClass().getName(), context.getHttpHeaders().getMediaType()));
throw new WebApplicationException(Response.Status.UNSUPPORTED_MEDIA_TYPE);
}
@@ -449,9 +449,9 @@
}
}
if (methodRecords.size() == 0) {
- logger.info(Messages.getMessage("noMethodInClassProducesHTTPMethod"), resource
+ logger.info(Messages.getMessage("noMethodInClassProducesHTTPMethod", resource
.getResourceClass().getName(), context.getHttpHeaders()
- .getRequestHeader(HttpHeaders.ACCEPT));
+ .getRequestHeader(HttpHeaders.ACCEPT)));
throw new WebApplicationException(Response.Status.NOT_ACCEPTABLE);
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/servlet/RestServlet.java Wed Mar 3 16:19:27 2010
@@ -134,9 +134,9 @@
logger.debug("Default properties {} used in RestServlet {}", defaultProperties, this);
String propertiesLocation = getInitParameter(PROPERTIES_INIT_PARAM);
if (propertiesLocation != null) {
- logger.info(Messages.getMessage("restServletUsePropertiesFileAtLocation"),
+ logger.info(Messages.getMessage("restServletUsePropertiesFileAtLocation",
propertiesLocation,
- PROPERTIES_INIT_PARAM);
+ PROPERTIES_INIT_PARAM));
// Load properties set on JVM. These should not override
// the ones set in the configuration file.
@@ -157,9 +157,9 @@
throws ClassNotFoundException, InstantiationException, IllegalAccessException {
String initParameter = getInitParameter(DEPLYMENT_CONF_PARAM);
if (initParameter != null) {
- logger.info(Messages.getMessage("restServletUseDeploymentConfigurationParam"),
+ logger.info(Messages.getMessage("restServletUseDeploymentConfigurationParam",
initParameter,
- DEPLYMENT_CONF_PARAM);
+ DEPLYMENT_CONF_PARAM));
// use ClassUtils.loadClass instead of Class.forName so we have
// classloader visibility into the Web module in J2EE environments
Class<?> confClass = ClassUtils.loadClass(initParameter);
@@ -174,9 +174,9 @@
Class<? extends Application> appClass = null;
String initParameter = getInitParameter(APPLICATION_INIT_PARAM);
if (initParameter != null) {
- logger.info(Messages.getMessage("restServletJAXRSApplicationInitParam"),
+ logger.info(Messages.getMessage("restServletJAXRSApplicationInitParam",
initParameter,
- APPLICATION_INIT_PARAM);
+ APPLICATION_INIT_PARAM));
// use ClassUtils.loadClass instead of Class.forName so we have
// classloader visibility into the Web module in J2EE environments
appClass = (Class<? extends Application>)ClassUtils.loadClass(initParameter);
Modified: incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java (original)
+++ incubator/wink/trunk/wink-spring-support/src/main/java/org/apache/wink/spring/internal/SpringLifecycleManager.java Wed Mar 3 16:19:27 2010
@@ -90,10 +90,10 @@
.isProvider(cls)) {
SpringObjectFactory old = class2factory.put(cls, objectFactory);
if (old != null) {
- logger.warn(Messages.getMessage("springClassReplaceNewerObjectFactory"), cls);
+ logger.warn(Messages.getMessage("springClassReplaceNewerObjectFactory", cls));
}
} else {
- logger.warn(Messages.getMessage("springBeanNotResourceNorProvider"), beanName, cls);
+ logger.warn(Messages.getMessage("springBeanNotResourceNorProvider", beanName, cls));
}
}
@@ -104,10 +104,10 @@
dynResource.setBeanName(beanName);
SpringObjectFactory old = id2factory.put(beanName, objectFactory);
if (old != null) {
- logger.warn(Messages.getMessage("springClassReplaceNewerObjectFactory"), beanName);
+ logger.warn(Messages.getMessage("springClassReplaceNewerObjectFactory", beanName));
}
} else {
- logger.warn(Messages.getMessage("springBeanClassNotDynamicResource"), beanName, cls);
+ logger.warn(Messages.getMessage("springBeanClassNotDynamicResource", beanName, cls));
}
}
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/WebDAVModelHelper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/WebDAVModelHelper.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/WebDAVModelHelper.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/model/WebDAVModelHelper.java Wed Mar 3 16:19:27 2010
@@ -85,8 +85,8 @@
try {
m.marshal(element, writer);
} catch (JAXBException e) {
- throw new RestException(String.format(Messages
- .getMessage("webDAVUnableToMarshalElement"), elementName), e);
+ throw new RestException(Messages
+ .getMessage("webDAVUnableToMarshalElement", elementName), e);
}
}
@@ -101,14 +101,14 @@
object = ((JAXBElement<?>)object).getValue();
}
if (!(elementClass.equals(object.getClass()))) {
- throw new RestException(String.format(Messages
- .getMessage("webDAVIncompatibleTypeInRequest"), elementName, object.getClass()
+ throw new RestException(Messages
+ .getMessage("webDAVIncompatibleTypeInRequest", elementName, object.getClass()
.getName(), elementClass.getName()));
}
return (T)object;
} catch (JAXBException e) {
- throw new RestException(String
- .format(Messages.getMessage("webDAVUnableToParseElement"), elementName), e);
+ throw new RestException(Messages.getMessage("webDAVUnableToParseElement", elementName),
+ e);
}
}
Modified: incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java?rev=918543&r1=918542&r2=918543&view=diff
==============================================================================
--- incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java (original)
+++ incubator/wink/trunk/wink-webdav/src/main/java/org/apache/wink/webdav/server/WebDAVResponseBuilder.java Wed Mar 3 16:19:27 2010
@@ -376,7 +376,7 @@
}
if (link == null) {
// no link in the resource
- logger.error(Messages.getMessage("webDAVNoEditOrSelfLink"), synd.getId());
+ logger.error(Messages.getMessage("webDAVNoEditOrSelfLink", synd.getId()));
throw new WebApplicationException();
}