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/08 18:12:54 UTC
svn commit: r961830 [2/4] - 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/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=961830&r1=961829&r2=961830&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 Thu Jul 8 16:12:52 2010
@@ -125,7 +125,7 @@ public class ProvidersRegistry {
private synchronized boolean addProvider(PriorityObjectFactory<?> objectFactory) {
Class<? extends Object> cls = objectFactory.getInstanceClass();
- logger.debug("Processing provider of type {}", cls); //$NON-NLS-1$
+ logger.trace("Processing provider of type {}", cls); //$NON-NLS-1$
boolean retValue = false;
@@ -138,7 +138,7 @@ public class ProvidersRegistry {
retValue = true;
}
if (ExceptionMapper.class.isAssignableFrom(cls)) {
- logger.debug("Adding type {} to ExceptionMappers list", cls); //$NON-NLS-1$
+ logger.trace("Adding type {} to ExceptionMappers list", cls); //$NON-NLS-1$
TreeSet<ObjectFactory<ExceptionMapper<?>>> exceptionMappersCopy =
new TreeSet<ObjectFactory<ExceptionMapper<?>>>(Collections.reverseOrder());
exceptionMappersCopy.addAll(exceptionMappers);
@@ -193,7 +193,7 @@ public class ProvidersRegistry {
if (contextType == null) {
throw new NullPointerException(Messages.getMessage("variableIsNull", "contextType")); //$NON-NLS-1$ //$NON-NLS-2$
}
- logger.debug("Getting ContextResolver for {} which has @Produces compatible with {}", //$NON-NLS-1$
+ logger.trace("Getting ContextResolver for {} which has @Produces compatible with {}", //$NON-NLS-1$
contextType,
mediaType);
if (mediaType == null) {
@@ -205,7 +205,7 @@ public class ProvidersRegistry {
* performance improvement
*/
if (contextResolvers.isMapEmpty()) {
- logger.debug("ContextResolvers MediaTypeMap was empty so returning null"); //$NON-NLS-1$
+ logger.trace("ContextResolvers MediaTypeMap was empty so returning null"); //$NON-NLS-1$
return null;
}
@@ -214,7 +214,7 @@ public class ProvidersRegistry {
if (factories.isEmpty()) {
logger
- .debug("Did not find a ContextResolver for {} which has @Produces compatible with {}", //$NON-NLS-1$
+ .trace("Did not find a ContextResolver for {} which has @Produces compatible with {}", //$NON-NLS-1$
contextType,
mediaType);
return null;
@@ -223,7 +223,7 @@ public class ProvidersRegistry {
if (factories.size() == 1) {
ObjectFactory<ContextResolver<?>> factory = factories.get(0);
logger
- .debug("Found ContextResolver ObjectFactory {} for {} which has @Produces compatible with {}", //$NON-NLS-1$
+ .trace("Found ContextResolver ObjectFactory {} for {} which has @Produces compatible with {}", //$NON-NLS-1$
new Object[] {factory, contextType, mediaType});
return (ContextResolver<T>)factory.getInstance(runtimeContext);
}
@@ -241,7 +241,7 @@ public class ProvidersRegistry {
}
logger
- .debug("Found multiple ContextResolver ObjectFactories {} for {} which has @Produces compatible with {} . Using Proxy object which will call all matching ContextResolvers to find correct context.", //$NON-NLS-1$
+ .trace("Found multiple ContextResolver ObjectFactories {} for {} which has @Produces compatible with {} . Using Proxy object which will call all matching ContextResolvers to find correct context.", //$NON-NLS-1$
new Object[] {providers, contextType, mediaType});
final MediaType mt = mediaType;
return (ContextResolver<T>)Proxy.newProxyInstance(getClass().getClassLoader(),
@@ -262,9 +262,9 @@ public class ProvidersRegistry {
Class<?> arg0 =
(Class<?>)args[0];
if (logger
- .isDebugEnabled()) {
+ .isTraceEnabled()) {
logger
- .debug("Calling {}.getContext({}) to find context for {} with @Produces media type compatible with {}", //$NON-NLS-1$
+ .trace("Calling {}.getContext({}) to find context for {} with @Produces media type compatible with {}", //$NON-NLS-1$
new Object[] {
resolver,
arg0,
@@ -276,9 +276,9 @@ public class ProvidersRegistry {
.getContext(arg0);
if (context != null) {
if (logger
- .isDebugEnabled()) {
+ .isTraceEnabled()) {
logger
- .debug("Returning {} from calling {}.getContext({}) to find context for {} with @Produces media type compatible with {}", //$NON-NLS-1$
+ .trace("Returning {} from calling {}.getContext({}) to find context for {} with @Produces media type compatible with {}", //$NON-NLS-1$
new Object[] {
context,
resolver,
@@ -289,9 +289,9 @@ public class ProvidersRegistry {
return context;
}
}
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
logger
- .debug("Did not find context for {} with @Produces media type compatible with {}", //$NON-NLS-1$
+ .trace("Did not find context for {} with @Produces media type compatible with {}", //$NON-NLS-1$
new Object[] {
contextType,
mt});
@@ -311,7 +311,7 @@ public class ProvidersRegistry {
if (type == null) {
throw new NullPointerException(Messages.getMessage("variableIsNull", "type")); //$NON-NLS-1$ //$NON-NLS-2$
}
- logger.debug("Getting ExceptionMapper for {} ", type); //$NON-NLS-1$
+ logger.trace("Getting ExceptionMapper for {} ", type); //$NON-NLS-1$
List<ExceptionMapper<?>> matchingMappers = new ArrayList<ExceptionMapper<?>>();
for (ObjectFactory<ExceptionMapper<?>> factory : exceptionMappers) {
@@ -326,11 +326,11 @@ public class ProvidersRegistry {
}
if (matchingMappers.isEmpty()) {
- logger.debug("Did not find an ExceptionMapper for {} ", type); //$NON-NLS-1$
+ logger.trace("Did not find an ExceptionMapper for {} ", type); //$NON-NLS-1$
return null;
}
- logger.debug("Found matching ExceptionMappers {} for type {} ", matchingMappers, type); //$NON-NLS-1$
+ logger.trace("Found matching ExceptionMappers {} for type {} ", matchingMappers, type); //$NON-NLS-1$
while (matchingMappers.size() > 1) {
Type first =
GenericsUtils.getGenericInterfaceParamType(matchingMappers.get(0).getClass(),
@@ -352,7 +352,7 @@ public class ProvidersRegistry {
}
ExceptionMapper<T> mapper = (ExceptionMapper<T>)matchingMappers.get(0);
- logger.debug("Found best matching ExceptionMapper {} for type {} ", mapper, type); //$NON-NLS-1$
+ logger.trace("Found best matching ExceptionMapper {} for type {} ", mapper, type); //$NON-NLS-1$
return mapper;
}
@@ -368,28 +368,28 @@ public class ProvidersRegistry {
if (mediaType == null) {
throw new NullPointerException(Messages.getMessage("variableIsNull", "mediaType")); //$NON-NLS-1$ //$NON-NLS-2$
}
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
logger
- .debug("Getting MessageBodyReader for class type {}, genericType {}, annotations {}, and media type {}", //$NON-NLS-1$
+ .trace("Getting MessageBodyReader for class type {}, genericType {}, annotations {}, and media type {}", //$NON-NLS-1$
new Object[] {type, genericType, anns, mediaType});
}
List<MediaTypeMap<MessageBodyReader<?>>.OFHolder<MessageBodyReader<?>>> factories =
messageBodyReaders.getProvidersByMediaType(mediaType, type);
- logger.debug("Found possible MessageBodyReader ObjectFactories {}", factories); //$NON-NLS-1$
+ logger.trace("Found possible MessageBodyReader ObjectFactories {}", factories); //$NON-NLS-1$
for (ObjectFactory<MessageBodyReader<?>> factory : factories) {
MessageBodyReader<?> reader = factory.getInstance(runtimeContext);
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
- logger.debug("Calling {}.isReadable( {}, {}, {}, {} )", new Object[] {reader, type, //$NON-NLS-1$
+ logger.trace("Calling {}.isReadable( {}, {}, {}, {} )", new Object[] {reader, type, //$NON-NLS-1$
genericType, anns, mediaType});
}
if (reader.isReadable(type, genericType, annotations, mediaType)) {
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<Annotation> anns =
(annotations == null) ? null : Arrays.asList(annotations);
- logger.debug("{}.isReadable( {}, {}, {}, {} ) returned true", new Object[] { //$NON-NLS-1$
+ logger.trace("{}.isReadable( {}, {}, {}, {} ) returned true", new Object[] { //$NON-NLS-1$
reader, type, genericType, anns, mediaType});
}
return (MessageBodyReader<T>)reader;
@@ -410,37 +410,37 @@ public class ProvidersRegistry {
if (mediaType == null) {
throw new NullPointerException(Messages.getMessage("variableIsNull", "mediaType")); //$NON-NLS-1$ //$NON-NLS-2$
}
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
logger
- .debug("Getting MessageBodyWriter for class type {}, genericType {}, annotations {}, and media type {}", //$NON-NLS-1$
+ .trace("Getting MessageBodyWriter for class type {}, genericType {}, annotations {}, and media type {}", //$NON-NLS-1$
new Object[] {type, genericType, anns, mediaType});
}
List<MediaTypeMap<MessageBodyWriter<?>>.OFHolder<MessageBodyWriter<?>>> writersFactories =
messageBodyWriters.getProvidersByMediaType(mediaType, type);
- logger.debug("Found possible MessageBodyWriter ObjectFactories {}", writersFactories); //$NON-NLS-1$
+ logger.trace("Found possible MessageBodyWriter ObjectFactories {}", writersFactories); //$NON-NLS-1$
for (ObjectFactory<MessageBodyWriter<?>> factory : writersFactories) {
MessageBodyWriter<?> writer = factory.getInstance(runtimeContext);
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
logger
- .debug("Calling {}.isWriteable( {}, {}, {}, {} )", new Object[] {writer, type, //$NON-NLS-1$
+ .trace("Calling {}.isWriteable( {}, {}, {}, {} )", new Object[] {writer, type, //$NON-NLS-1$
genericType, anns, mediaType});
}
if (writer.isWriteable(type, genericType, annotations, mediaType)) {
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<Annotation> anns =
(annotations == null) ? null : Arrays.asList(annotations);
- logger.debug("{}.isWriteable( {}, {}, {}, {} ) returned true", new Object[] { //$NON-NLS-1$
+ logger.trace("{}.isWriteable( {}, {}, {}, {} ) returned true", new Object[] { //$NON-NLS-1$
writer, type, genericType, anns, mediaType});
}
return (MessageBodyWriter<T>)writer;
}
}
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<Annotation> anns = (annotations == null) ? null : Arrays.asList(annotations);
logger
- .debug("No MessageBodyWriter returned true for isWriteable( {}, {}, {}, {} )", new Object[] { //$NON-NLS-1$
+ .trace("No MessageBodyWriter returned true for isWriteable( {}, {}, {}, {} )", new Object[] { //$NON-NLS-1$
type, genericType, anns, mediaType});
}
return null;
@@ -449,11 +449,11 @@ public class ProvidersRegistry {
public Set<MediaType> getMessageBodyReaderMediaTypesLimitByIsReadable(Class<?> type,
RuntimeContext runtimeContext) {
Set<MediaType> mediaTypes = new HashSet<MediaType>();
- logger.debug("Searching MessageBodyReaders media types limited by class type {}", type); //$NON-NLS-1$
+ logger.trace("Searching MessageBodyReaders media types limited by class type {}", type); //$NON-NLS-1$
List<MediaTypeMap<MessageBodyReader<?>>.OFHolder<MessageBodyReader<?>>> readerFactories =
messageBodyReaders.getProvidersByMediaType(MediaType.WILDCARD_TYPE, type);
- logger.debug("Found all MessageBodyReader ObjectFactories limited by class type {}", //$NON-NLS-1$
+ logger.trace("Found all MessageBodyReader ObjectFactories limited by class type {}", //$NON-NLS-1$
readerFactories);
Annotation[] ann = new Annotation[0];
for (ObjectFactory<MessageBodyReader<?>> factory : readerFactories) {
@@ -467,19 +467,19 @@ public class ProvidersRegistry {
}
for (String v : values) {
MediaType mt = MediaType.valueOf(v);
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<Annotation> anns = (ann == null) ? null : Arrays.asList(ann);
- logger.debug("Calling {}.isReadable( {}, {}, {}, {} )", new Object[] {reader, //$NON-NLS-1$
+ logger.trace("Calling {}.isReadable( {}, {}, {}, {} )", new Object[] {reader, //$NON-NLS-1$
type, type, anns, mt});
}
if (reader.isReadable(type, type, ann, mt)) {
- logger.debug("Adding {} to media type set", mt); //$NON-NLS-1$
+ logger.trace("Adding {} to media type set", mt); //$NON-NLS-1$
mediaTypes.add(mt);
}
}
}
logger
- .debug("Found {} from @Consumes values from all MessageBodyReader ObjectFactories compatible with Java type {}", //$NON-NLS-1$
+ .trace("Found {} from @Consumes values from all MessageBodyReader ObjectFactories compatible with Java type {}", //$NON-NLS-1$
mediaTypes,
type);
return mediaTypes;
@@ -488,11 +488,11 @@ public class ProvidersRegistry {
public MediaType getMessageBodyWriterMediaTypeLimitByIsWritable(Class<?> type,
RuntimeContext runtimeContext) {
List<MediaType> mediaTypes = new ArrayList<MediaType>();
- logger.debug("Searching MessageBodyWriters media types limited by class type {}", type); //$NON-NLS-1$
+ logger.trace("Searching MessageBodyWriters media types limited by class type {}", type); //$NON-NLS-1$
List<MediaTypeMap<MessageBodyWriter<?>>.OFHolder<MessageBodyWriter<?>>> writerFactories =
messageBodyWriters.getProvidersByMediaType(MediaType.WILDCARD_TYPE, type);
- logger.debug("Found all MessageBodyWriter ObjectFactories limited by class type {}", //$NON-NLS-1$
+ logger.trace("Found all MessageBodyWriter ObjectFactories limited by class type {}", //$NON-NLS-1$
writerFactories);
Annotation[] ann = new Annotation[0];
for (ObjectFactory<MessageBodyWriter<?>> factory : writerFactories) {
@@ -506,13 +506,13 @@ public class ProvidersRegistry {
}
for (String v : values) {
MediaType mt = MediaType.valueOf(v);
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<Annotation> anns = (ann == null) ? null : Arrays.asList(ann);
- logger.debug("Calling {}.isWritable( {}, {}, {}, {} )", new Object[] {writer, //$NON-NLS-1$
+ logger.trace("Calling {}.isWritable( {}, {}, {}, {} )", new Object[] {writer, //$NON-NLS-1$
type, type, anns, mt});
}
if (writer.isWriteable(type, type, ann, mt)) {
- logger.debug("Returning media type {}", mt); //$NON-NLS-1$
+ logger.trace("Returning media type {}", mt); //$NON-NLS-1$
return mt;
}
}
@@ -620,14 +620,14 @@ public class ProvidersRegistry {
}
logger
- .debug("Getting providers by media type by calling getProvidersByMediaType({}, {})", //$NON-NLS-1$
+ .trace("Getting providers by media type by calling getProvidersByMediaType({}, {})", //$NON-NLS-1$
mediaType,
cls);
SoftConcurrentMap<MediaType, List<OFHolder<T>>> mediaTypeToProvidersCache =
providersCache.get(cls);
if (mediaTypeToProvidersCache == null) {
logger
- .debug("MediaType to providers cache for class {} does not exist so creating", //$NON-NLS-1$
+ .trace("MediaType to providers cache for class {} does not exist so creating", //$NON-NLS-1$
cls);
mediaTypeToProvidersCache = new SoftConcurrentMap<MediaType, List<OFHolder<T>>>();
providersCache.put(cls, mediaTypeToProvidersCache);
@@ -635,7 +635,7 @@ public class ProvidersRegistry {
List<OFHolder<T>> list = mediaTypeToProvidersCache.get(mediaType);
- logger.debug("Get media type to providers cache for media type {} resulted in {}", //$NON-NLS-1$
+ logger.trace("Get media type to providers cache for media type {} resulted in {}", //$NON-NLS-1$
mediaType,
list);
if (list == null) {
@@ -729,17 +729,17 @@ public class ProvidersRegistry {
}
}));
- if (logger.isDebugEnabled()) {
- logger.debug("Added ObjectFactory {} with MediaType {} to MediaTypeMap {}", //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace("Added ObjectFactory {} with MediaType {} to MediaTypeMap {}", //$NON-NLS-1$
new Object[] {objectFactory, key, this});
- logger.debug("EntrySet is {}", newEntrySet); //$NON-NLS-1$
+ logger.trace("EntrySet is {}", newEntrySet); //$NON-NLS-1$
}
entrySet = newEntrySet;
data = copyOfMap;
// the set of providers has been changed so must clear the cache
providersCache.clear();
- logger.debug("Cleared the providers cache"); //$NON-NLS-1$
+ logger.trace("Cleared the providers cache"); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ClassUtils.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ClassUtils.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ClassUtils.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/ClassUtils.java Thu Jul 8 16:12:52 2010
@@ -69,20 +69,20 @@ public class ClassUtils {
try {
// try context class loader first
- logger.debug("Loading class {} using thread context classloader.", className); //$NON-NLS-1$
+ logger.trace("Loading class {} using thread context classloader.", className); //$NON-NLS-1$
return Class.forName(className,
true,
Thread.currentThread().getContextClassLoader());
} catch (ClassNotFoundException cnfe) {
try {
// fallback to current classloader
- logger.debug("Loading class {} using current classloader.", className); //$NON-NLS-1$
+ logger.trace("Loading class {} using current classloader.", className); //$NON-NLS-1$
return Class.forName(className,
true,
ClassUtils.class.getClassLoader());
} catch (ClassNotFoundException cnfe2) {
// fallback to system classloader
- logger.debug("Loading class {} using system classloader.", className); //$NON-NLS-1$
+ logger.trace("Loading class {} using system classloader.", className); //$NON-NLS-1$
try {
return Class.forName(className);
} catch (ClassNotFoundException cnfe3) {
@@ -105,7 +105,7 @@ public class ClassUtils {
// Class.forName does not support primitives, so do a last check:
Class cls = (Class) loadClassMap.get(className);
if (cls != null) {
- logger.debug("Returning class {}", className); //$NON-NLS-1$
+ logger.trace("Returning class {}", className); //$NON-NLS-1$
return cls;
}
throw (ClassNotFoundException) ret;
Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/utils/FileLoader.java Thu Jul 8 16:12:52 2010
@@ -81,12 +81,12 @@ public class FileLoader {
throw new NullPointerException(Messages.getMessage("variableIsNull", "fileName")); //$NON-NLS-1$ //$NON-NLS-2$
}
- logger.debug("Searching for {} in file system.", fileName); //$NON-NLS-1$
+ logger.trace("Searching for {} in file system.", fileName); //$NON-NLS-1$
File file = new File(fileName);
if (file.isFile()) {
// since file is a normal file, return it
- logger.debug("File {} found in file system.", fileName); //$NON-NLS-1$
+ logger.trace("File {} found in file system.", fileName); //$NON-NLS-1$
return new FileInputStream(file);
}
@@ -124,21 +124,21 @@ public class FileLoader {
* org.apache.wink.common.internal.utils.ClassUtils?
*/
- logger.debug("Searching for {} using thread context classloader.", filename); //$NON-NLS-1$
+ logger.trace("Searching for {} using thread context classloader.", filename); //$NON-NLS-1$
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
Enumeration<URL> resources = loadFileUsingClassLoader(classLoader, filename);
if (resources.hasMoreElements()) {
return resources;
}
- logger.debug("Searching for {} using current classloader.", filename); //$NON-NLS-1$
+ logger.trace("Searching for {} using current classloader.", filename); //$NON-NLS-1$
classLoader = FileLoader.class.getClassLoader();
resources = loadFileUsingClassLoader(classLoader, filename);
if (resources.hasMoreElements()) {
return resources;
}
- logger.debug("Searching for {} using system classloader.", filename); //$NON-NLS-1$
+ logger.trace("Searching for {} using system classloader.", filename); //$NON-NLS-1$
return ClassLoader.getSystemResources(filename);
}
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=961830&r1=961829&r2=961830&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 Thu Jul 8 16:12:52 2010
@@ -438,14 +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$
+ logger.trace("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$
+ logger.trace("parsePath() exit returning {}", pathSegments); //$NON-NLS-1$
return pathSegments;
}
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=961830&r1=961829&r2=961830&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 Thu Jul 8 16:12:52 2010
@@ -80,15 +80,15 @@ public class ProviderUtils {
* @return the charset
*/
public static String getCharset(MediaType m, HttpHeaders requestHeaders) {
- logger.debug("getCharset({}, {})", m, requestHeaders); //$NON-NLS-1$
+ logger.trace("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); //$NON-NLS-1$
+ logger.trace("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); //$NON-NLS-1$
+ .trace("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", //$NON-NLS-1$
+ logger.trace("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); //$NON-NLS-1$
+ logger.trace("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); //$NON-NLS-1$
+ logger.trace("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", //$NON-NLS-1$
+ .trace("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", //$NON-NLS-1$
+ logger.trace("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); //$NON-NLS-1$
+ logger.trace("IllegalCharsetNameException for {}", charset, e); //$NON-NLS-1$
validCharsets.put(charset, Boolean.FALSE);
} catch (UnsupportedCharsetException e) {
- logger.debug("UnsupportedCharsetException for {}", charset, e); //$NON-NLS-1$
+ logger.trace("UnsupportedCharsetException for {}", charset, e); //$NON-NLS-1$
validCharsets.put(charset, Boolean.FALSE);
} catch (IllegalArgumentException e) {
- logger.debug("IllegalArgumentException for {}", charset, e); //$NON-NLS-1$
+ logger.trace("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", //$NON-NLS-1$
+ logger.trace("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=961830&r1=961829&r2=961830&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 Thu Jul 8 16:12:52 2010
@@ -215,3 +215,4 @@ saxParserConfigurationException=The syst
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.
+processingRequestTo=Processing {0} request to {1}
Modified: incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/i18n/MessagesTest.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/i18n/MessagesTest.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/i18n/MessagesTest.java (original)
+++ incubator/wink/trunk/wink-common/src/test/java/org/apache/wink/common/internal/i18n/MessagesTest.java Thu Jul 8 16:12:52 2010
@@ -424,7 +424,7 @@ public class MessagesTest extends TestCa
// SLF4J logger can take an extra exception param
if (chickenLips == remainingParams-1) {
// token count may be one greater than chickenlips, since messages may be something like:
- // logger.debug("abcd", new RuntimeException());
+ // logger.trace("abcd", new RuntimeException());
// or:
// logger.error(Messages.getMessage("saxParseException", type.getName()), e);
// System.out.print("\nWARNING: Expected " + chickenLips + " parameters, but found " + tokenizer.countTokens() + (string.startsWith("Messages") ? " for key " : " for formatted string ") +
@@ -470,7 +470,7 @@ public class MessagesTest extends TestCa
}
- // check all production code .java files for all calls to Logger.debug, error, warn, and info to ensure
+ // check all production code .java files for all calls to Logger.trace, error, warn, and info to ensure
// that the formatted string is correct, and that the reference, if any, to resource.properties keys is correct.
public void testMessages() throws IOException {
@@ -505,7 +505,7 @@ public class MessagesTest extends TestCa
// (we can't really use regex here to match balanced parentheses)
ArrayList<Pattern> betweenLoggersPatterns = new ArrayList<Pattern>();
if (loggerVariableName != null) {
- betweenLoggersPatterns.add(Pattern.compile("\\G.*?" + loggerVariableName + "\\s*?\\.\\s*?(info|debug|error|warn)\\s*?\\((.*?);", Pattern.COMMENTS));
+ betweenLoggersPatterns.add(Pattern.compile("\\G.*?" + loggerVariableName + "\\s*?\\.\\s*?(info|trace|debug|error|warn)\\s*?\\((.*?);", Pattern.COMMENTS));
betweenLoggersPatterns.add(patternForNoLogger); // some patterns may get checked twice, but that's ok
} else {
betweenLoggersPatterns.add(patternForNoLogger);
@@ -514,7 +514,8 @@ public class MessagesTest extends TestCa
for (Pattern betweenLoggersPattern: betweenLoggersPatterns.toArray(new Pattern[]{})) {
Matcher betweenLoggersMatcher = betweenLoggersPattern.matcher(fileText);
while (betweenLoggersMatcher.find()) {
- parseAndInspect(betweenLoggersMatcher.group(2), !betweenLoggersMatcher.group(1).equals("debug"), fileText, file.getAbsolutePath(), unusedProps);
+ boolean externalizationRequired = !betweenLoggersMatcher.group(1).equals("debug") && !betweenLoggersMatcher.group(1).equals("trace");
+ parseAndInspect(betweenLoggersMatcher.group(2), externalizationRequired, fileText, file.getAbsolutePath(), unusedProps);
}
}
}
Modified: incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java (original)
+++ incubator/wink/trunk/wink-examples/apps/QADefect/src/main/java/org/apache/wink/example/qadefect/legacy/DataStore.java Thu Jul 8 16:12:52 2010
@@ -302,7 +302,7 @@ public class DataStore {
return getDefects();
}
- logger.debug("Defect search was actived.");
+ logger.trace("Defect search was actived.");
// in real world there should have been a sql query, but for example
// purpose
// we'll do search manually
@@ -316,12 +316,12 @@ public class DataStore {
l_defects: for (DefectBean defect : defects.values()) {
for (Entry<String, String> entry : searchParameters.entrySet()) {
String value = entry.getValue();
- logger.debug("Parameter: {}; value: {}", entry.getKey(), value);
+ logger.trace("Parameter: {}; value: {}", entry.getKey(), value);
if (entry.getKey().equals(DefectsResource.ASSIGNED_TO)) {
if (defect.getAssignedTo() == null || !defect.getAssignedTo()
.equalsIgnoreCase(value)) {
- logger.debug("Defect " + defect.getId()
+ logger.trace("Defect " + defect.getId()
+ " was skipped, since it doesn't match "
+ DefectsResource.ASSIGNED_TO
+ " parameter: "
@@ -337,7 +337,7 @@ public class DataStore {
.contains(value))
&& (defect.getStatus() != null && !defect.getStatus().toLowerCase()
.contains(value))) {
- logger.debug("Defect " + defect.getId()
+ logger.trace("Defect " + defect.getId()
+ " was skipped, since it doesn't match "
+ DefectsResource.FTS
+ " parameter.");
@@ -347,7 +347,7 @@ public class DataStore {
if (entry.getKey().equals(DefectsResource.SEVERIIY)) {
if (defect.getSeverity() == null || !defect.getSeverity()
.equalsIgnoreCase(value)) {
- logger.debug("Defect " + defect.getId()
+ logger.trace("Defect " + defect.getId()
+ " was skipped, since it doesn't match "
+ DefectsResource.SEVERIIY
+ " parameter: "
@@ -358,7 +358,7 @@ public class DataStore {
}
// defect matched all filters
// add it to result collection
- logger.debug("Defect " + defect.getId() + " was added to result.");
+ logger.trace("Defect " + defect.getId() + " was added to result.");
hashSet.add(defect);
}
}
Modified: incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonArrayProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonArrayProvider.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonArrayProvider.java (original)
+++ incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonArrayProvider.java Thu Jul 8 16:12:52 2010
@@ -98,7 +98,7 @@ public class JsonArrayProvider implement
callbackParam =
uriInfo.getQueryParameters().getFirst(RestConstants.REST_PARAM_JSON_CALLBACK);
} catch (Exception e) {
- logger.debug("Could not get the URI callback param", e); //$NON-NLS-1$
+ logger.trace("Could not get the URI callback param", e); //$NON-NLS-1$
}
Charset charset = Charset.forName(ProviderUtils.getCharset(mediaType));
Modified: incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java (original)
+++ incubator/wink/trunk/wink-providers/wink-json-provider/src/main/java/org/apache/wink/providers/json/JsonProvider.java Thu Jul 8 16:12:52 2010
@@ -96,7 +96,7 @@ public class JsonProvider implements Mes
callbackParam =
uriInfo.getQueryParameters().getFirst(RestConstants.REST_PARAM_JSON_CALLBACK);
} catch (Exception e) {
- logger.debug("Could not get the URI callback param", e); //$NON-NLS-1$
+ logger.trace("Could not get the URI callback param", e); //$NON-NLS-1$
}
mediaType = MediaTypeUtils.setDefaultCharsetOnMediaTypeHeader(httpHeaders, mediaType);
Charset charset = Charset.forName(ProviderUtils.getCharset(mediaType));
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/handlers/AbstractHandlersChain.java Thu Jul 8 16:12:52 2010
@@ -57,7 +57,7 @@ public abstract class AbstractHandlersCh
// get the next handler from the chain to handle
T handler = iterator.next();
// invoke the handler
- logger.debug("Invoking handler: {}", handler.getClass().getName()); //$NON-NLS-1$
+ logger.trace("Invoking handler: {}", handler.getClass().getName()); //$NON-NLS-1$
handle(handler, context);
} finally {
// set the iterator back one handler on the chain so the same
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/DeploymentConfiguration.java Thu Jul 8 16:12:52 2010
@@ -143,7 +143,7 @@ public class DeploymentConfiguration imp
}
appObjectFactories = new HashSet<ObjectFactory<?>>(8);
- logger.debug("Deployment configuration properties: {}", properties); //$NON-NLS-1$
+ logger.trace("Deployment configuration properties: {}", properties); //$NON-NLS-1$
// check to see if an override property was specified. if so, then
// configure
@@ -315,12 +315,12 @@ public class DeploymentConfiguration imp
Properties lproperties = new Properties();
lproperties.load(is);
- logger.debug("Alternative shortcuts properties: {}", lproperties); //$NON-NLS-1$
+ logger.trace("Alternative shortcuts properties: {}", lproperties); //$NON-NLS-1$
alternateShortcutMap = new HashMap<String, String>();
for (Entry<Object, Object> entry : lproperties.entrySet()) {
alternateShortcutMap.put((String)entry.getKey(), (String)entry.getValue());
}
- logger.debug("Alternative shortcuts map: {}", alternateShortcutMap); //$NON-NLS-1$
+ logger.trace("Alternative shortcuts map: {}", alternateShortcutMap); //$NON-NLS-1$
} catch (IOException e) {
logger.error(Messages.getMessage("alternateShortcutMapLoadFailure"), e); //$NON-NLS-1$
throw new WebApplicationException(e);
@@ -351,7 +351,7 @@ public class DeploymentConfiguration imp
properties.getProperty(MEDIATYPE_MAPPER_FACTORY_CLASS_PROP);
if (mediaTypeMapperFactoryClassName != null) {
try {
- logger.debug("MediaTypeMappingFactory Class is: {}", //$NON-NLS-1$
+ logger.trace("MediaTypeMappingFactory Class is: {}", //$NON-NLS-1$
mediaTypeMapperFactoryClassName);
Class<MediaTypeMapperFactory> handlerFactoryClass =
(Class<MediaTypeMapperFactory>)Class
@@ -389,7 +389,7 @@ public class DeploymentConfiguration imp
String handlersFactoryClassName = properties.getProperty(HANDLERS_FACTORY_CLASS_PROP);
if (handlersFactoryClassName != null) {
try {
- logger.debug("Handlers Factory Class is: {}", handlersFactoryClassName); //$NON-NLS-1$
+ logger.trace("Handlers Factory Class is: {}", handlersFactoryClassName); //$NON-NLS-1$
// use ClassUtils.getClass instead of Class.forName so we have
// classloader visibility into the Web module in J2EE
// environments
@@ -462,7 +462,7 @@ public class DeploymentConfiguration imp
}
}
handlersChain.addHandler(createHandler(InvokeMethodHandler.class));
- logger.debug("Request handlers chain is: {}", handlersChain); //$NON-NLS-1$
+ logger.trace("Request handlers chain is: {}", handlersChain); //$NON-NLS-1$
return handlersChain;
}
@@ -521,7 +521,7 @@ public class DeploymentConfiguration imp
}
handlersChain.addHandler(createHandler(FlushResultHandler.class));
handlersChain.addHandler(createHandler(HeadMethodHandler.class));
- logger.debug("Response handlers chain is: {}", handlersChain); //$NON-NLS-1$
+ logger.trace("Response handlers chain is: {}", handlersChain); //$NON-NLS-1$
return handlersChain;
}
@@ -545,14 +545,14 @@ public class DeploymentConfiguration imp
}
}
handlersChain.addHandler(createHandler(FlushResultHandler.class));
- logger.debug("Error handlers chain is: {}", handlersChain); //$NON-NLS-1$
+ logger.trace("Error handlers chain is: {}", handlersChain); //$NON-NLS-1$
return handlersChain;
}
private <T extends Handler> T createHandler(Class<T> cls) {
try {
T handler = cls.newInstance();
- logger.debug("Calling {}.init(Properties)", cls); //$NON-NLS-1$
+ logger.trace("Calling {}.init(Properties)", cls); //$NON-NLS-1$
handler.init(getProperties());
return handler;
} catch (InstantiationException e) {
@@ -564,11 +564,11 @@ public class DeploymentConfiguration imp
public void setHttpMethodOverrideHeaders(String[] httpMethodOverrideHeaders) {
this.httpMethodOverrideHeaders = httpMethodOverrideHeaders;
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
List<String> overrideHeaders =
(httpMethodOverrideHeaders == null) ? null : Arrays
.asList(httpMethodOverrideHeaders);
- logger.debug("Setting HTTP Method override headers: {}", overrideHeaders); //$NON-NLS-1$
+ logger.trace("Setting HTTP Method override headers: {}", overrideHeaders); //$NON-NLS-1$
}
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/MediaTypeMapper.java Thu Jul 8 16:12:52 2010
@@ -42,10 +42,10 @@ public final class MediaTypeMapper {
public void addMappings(List<? extends MediaTypeMappingRecord> records) {
if (records == null) {
- logger.debug("No media type mapping records to add"); //$NON-NLS-1$
+ logger.trace("No media type mapping records to add"); //$NON-NLS-1$
return;
}
- logger.debug("Media type mapping records to add: {}", records); //$NON-NLS-1$
+ logger.trace("Media type mapping records to add: {}", records); //$NON-NLS-1$
this.mappings.addAll(records);
}
@@ -59,16 +59,16 @@ public final class MediaTypeMapper {
*/
public MediaType mapOutputMediaType(MediaType responseMediaType, HttpHeaders requestHeaders) {
for (MediaTypeMappingRecord mappingRecord : mappings) {
- logger.debug("Attempting to map media type using mapping record: {}", mappingRecord); //$NON-NLS-1$
+ logger.trace("Attempting to map media type using mapping record: {}", mappingRecord); //$NON-NLS-1$
MediaType replacement = mappingRecord.match(requestHeaders, responseMediaType);
if (replacement != null) {
- logger.debug("Mapped user media type to: {} using mapping record: {}", //$NON-NLS-1$
+ logger.trace("Mapped user media type to: {} using mapping record: {}", //$NON-NLS-1$
replacement,
mappingRecord);
return replacement;
}
}
- logger.debug("Did not find a mapping record so returning original response media type: {}", //$NON-NLS-1$
+ logger.trace("Did not find a mapping record so returning original response media type: {}", //$NON-NLS-1$
responseMediaType);
return responseMediaType; // returning the same
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/RequestProcessor.java Thu Jul 8 16:12:52 2010
@@ -80,7 +80,7 @@ public class RequestProcessor {
String loadWinkApplicationsProperty =
configuration.getProperties().getProperty(PROPERTY_LOAD_WINK_APPLICATIONS,
Boolean.toString(true));
- logger.debug("{} property is set to: {}", //$NON-NLS-1$
+ logger.trace("{} property is set to: {}", //$NON-NLS-1$
PROPERTY_LOAD_WINK_APPLICATIONS,
loadWinkApplicationsProperty);
final Set<Class<?>> classes =
@@ -99,7 +99,7 @@ public class RequestProcessor {
Properties properties = configuration.getProperties();
String registerRootResource =
properties.getProperty(PROPERTY_ROOT_RESOURCE, PROPERTY_ROOT_RESOURCE_DEFAULT);
- logger.debug("{} property is set to: {}", PROPERTY_ROOT_RESOURCE, registerRootResource); //$NON-NLS-1$
+ logger.trace("{} property is set to: {}", PROPERTY_ROOT_RESOURCE, registerRootResource); //$NON-NLS-1$
if (registerRootResource.equals(PROPERTY_ROOT_RESOURCE_ATOM)) {
RegistrationUtils.InnerApplication application =
new RegistrationUtils.InnerApplication(RootResource.class);
@@ -109,7 +109,7 @@ public class RequestProcessor {
// do nothing
} else {
String css = properties.getProperty(PROPERTY_ROOT_RESOURCE_CSS);
- logger.debug("{} property is set to: {}", PROPERTY_ROOT_RESOURCE_CSS, css); //$NON-NLS-1$
+ logger.trace("{} property is set to: {}", PROPERTY_ROOT_RESOURCE_CSS, css); //$NON-NLS-1$
HtmlServiceDocumentResource instance = new HtmlServiceDocumentResource();
if (css != null) {
instance.setServiceDocumentCssPath(css);
@@ -134,11 +134,20 @@ public class RequestProcessor {
public void handleRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException {
try {
+ if (logger.isDebugEnabled()) {
+ String requestString = request.getProtocol() + "://"; //$NON-NLS-1$
+ requestString += ((request.getLocalName() != null && request.getLocalName().length() > 0) ? request.getLocalName() : request.getLocalAddr());
+ requestString += ":"; //$NON-NLS-1$
+ requestString += request.getLocalPort();
+ requestString += request.getRequestURI();
+ requestString += ((request.getQueryString() != null && request.getQueryString().length() > 0) ? ("?" + request.getQueryString()) : ""); //$NON-NLS-1$ $NON-NLS-2$
+ logger.debug(Messages.getMessage("processingRequestTo", request.getMethod(), requestString)); //$NON-NLS-1$
+ }
handleRequestWithoutFaultBarrier(request, response);
} catch (Throwable t) {
// exception was not handled properly
- if (logger.isDebugEnabled()) {
- logger.debug(Messages.getMessage("unhandledExceptionToContainer"), t); //$NON-NLS-1$
+ if (logger.isTraceEnabled()) {
+ logger.trace(Messages.getMessage("unhandledExceptionToContainer"), t); //$NON-NLS-1$
} else {
if (logger.isInfoEnabled()) {
logger.info(Messages.getMessage("unhandledExceptionToContainer")); //$NON-NLS-1$
@@ -158,21 +167,21 @@ public class RequestProcessor {
try {
ServerMessageContext msgContext = createMessageContext(request, response);
RuntimeContextTLS.setRuntimeContext(msgContext);
- logger.debug("Set message context and starting request handlers chain: {}", msgContext); //$NON-NLS-1$
+ logger.trace("Set message context and starting request handlers chain: {}", msgContext); //$NON-NLS-1$
// run the request handler chain
configuration.getRequestHandlersChain().run(msgContext);
logger
- .debug("Finished request handlers chain and starting response handlers chain: {}", //$NON-NLS-1$
+ .trace("Finished request handlers chain and starting response handlers chain: {}", //$NON-NLS-1$
msgContext);
// run the response handler chain
configuration.getResponseHandlersChain().run(msgContext);
- logger.debug("Attempting to release resource instance"); //$NON-NLS-1$
+ logger.trace("Attempting to release resource instance"); //$NON-NLS-1$
isReleaseResourcesCalled = true;
try {
releaseResources(msgContext);
} catch (Exception e) {
- logger.debug("Caught exception when releasing resource object", e); //$NON-NLS-1$
+ logger.trace("Caught exception when releasing resource object", e); //$NON-NLS-1$
throw e;
}
} catch (Throwable t) {
@@ -184,7 +193,7 @@ public class RequestProcessor {
RuntimeContextTLS.setRuntimeContext(msgContext);
msgContext.setResponseEntity(t);
// run the error handler chain
- logger.debug("Exception occured, starting error handlers chain: {}", msgContext); //$NON-NLS-1$
+ logger.trace("Exception occured, starting error handlers chain: {}", msgContext); //$NON-NLS-1$
configuration.getErrorHandlersChain().run(msgContext);
RuntimeContextTLS.setRuntimeContext(originalContext);
@@ -193,7 +202,7 @@ public class RequestProcessor {
try {
releaseResources(originalContext);
} catch (Exception e2) {
- logger.debug("Caught exception when releasing resource object", e2); //$NON-NLS-1$
+ logger.trace("Caught exception when releasing resource object", e2); //$NON-NLS-1$
}
}
} catch (Exception e) {
@@ -203,13 +212,13 @@ public class RequestProcessor {
try {
releaseResources(originalContext);
} catch (Exception e2) {
- logger.debug("Caught exception when releasing resource object", e2); //$NON-NLS-1$
+ logger.trace("Caught exception when releasing resource object", e2); //$NON-NLS-1$
}
}
throw e;
}
} finally {
- logger.debug("Finished response handlers chain"); //$NON-NLS-1$
+ logger.trace("Finished response handlers chain"); //$NON-NLS-1$
RuntimeContextTLS.setRuntimeContext(null);
}
}
@@ -219,7 +228,7 @@ public class RequestProcessor {
if (searchResult != null) {
List<ResourceInstance> resourceInstances = searchResult.getData().getMatchedResources();
for (ResourceInstance res : resourceInstances) {
- logger.debug("Releasing resource instance"); //$NON-NLS-1$
+ logger.trace("Releasing resource instance"); //$NON-NLS-1$
res.releaseInstance(msgContext);
}
}
@@ -283,7 +292,7 @@ public class RequestProcessor {
RequestProcessor requestProcessor =
(RequestProcessor)servletContext.getAttribute(attributeName);
logger
- .debug("Retrieving request processor {} using attribute name {} in servlet context {}", //$NON-NLS-1$
+ .trace("Retrieving request processor {} using attribute name {} in servlet context {}", //$NON-NLS-1$
new Object[] {requestProcessor, attributeName, servletContext});
return requestProcessor;
}
@@ -293,7 +302,7 @@ public class RequestProcessor {
if (attributeName == null || attributeName.length() == 0) {
attributeName = RequestProcessor.class.getName();
}
- logger.debug("Storing request processor {} using attribute name {} in servlet context {}", //$NON-NLS-1$
+ logger.trace("Storing request processor {} using attribute name {} in servlet context {}", //$NON-NLS-1$
new Object[] {this, attributeName, servletContext});
servletContext.setAttribute(attributeName, this);
}
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/application/ApplicationProcessor.java Thu Jul 8 16:12:52 2010
@@ -65,12 +65,12 @@ public class ApplicationProcessor {
}
public void process() {
- logger.debug("Processing Application: {}", application); //$NON-NLS-1$
+ logger.trace("Processing Application: {}", application); //$NON-NLS-1$
double priority = WinkApplication.DEFAULT_PRIORITY;
if (application instanceof WinkApplication) {
priority = ((WinkApplication)application).getPriority();
- logger.debug("WinkApplication priority is set to: {}", priority); //$NON-NLS-1$
+ logger.trace("WinkApplication priority is set to: {}", priority); //$NON-NLS-1$
}
// process singletons
@@ -89,7 +89,7 @@ public class ApplicationProcessor {
processWinkApplication((WinkApplication)application);
}
- logger.debug("Processing of Application completed."); //$NON-NLS-1$
+ logger.trace("Processing of Application completed."); //$NON-NLS-1$
}
private void processWinkApplication(WinkApplication sApplication) {
@@ -97,13 +97,13 @@ public class ApplicationProcessor {
double priority = sApplication.getPriority();
if (instances == null) {
- logger.debug("WinkApplication.getInstances() returned null"); //$NON-NLS-1$
+ logger.trace("WinkApplication.getInstances() returned null"); //$NON-NLS-1$
return;
}
for (Object obj : instances) {
try {
- logger.debug("Processing instance: {}", obj); //$NON-NLS-1$
+ logger.trace("Processing instance: {}", obj); //$NON-NLS-1$
Class<?> cls = obj.getClass();
@@ -138,7 +138,7 @@ public class ApplicationProcessor {
for (Class<?> cls : classes) {
try {
- logger.debug("Processing class: {}", cls); //$NON-NLS-1$
+ logger.trace("Processing class: {}", cls); //$NON-NLS-1$
// the validations were moved to registry
@@ -173,7 +173,7 @@ public class ApplicationProcessor {
// add singletons
for (Object obj : singletons) {
try {
- logger.debug("Processing singleton: {}", obj); //$NON-NLS-1$
+ logger.trace("Processing singleton: {}", obj); //$NON-NLS-1$
Class<?> cls = obj.getClass();
Modified: incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpHeadersImpl.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpHeadersImpl.java?rev=961830&r1=961829&r2=961830&view=diff
==============================================================================
--- incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpHeadersImpl.java (original)
+++ incubator/wink/trunk/wink-server/src/main/java/org/apache/wink/server/internal/contexts/HttpHeadersImpl.java Thu Jul 8 16:12:52 2010
@@ -90,12 +90,12 @@ public class HttpHeadersImpl implements
acceptLanguageTemp.append(requestHeader.get(c));
}
String acceptLanguage = acceptLanguageTemp.toString();
- logger.debug("Accept-Language combined header is {}", acceptLanguage); //$NON-NLS-1$
+ logger.trace("Accept-Language combined header is {}", acceptLanguage); //$NON-NLS-1$
AcceptLanguage acceptLanguages = AcceptLanguage.valueOf(acceptLanguage);
acceptableLanguages = acceptLanguages.getAcceptableLanguages();
}
}
- logger.debug("getAcceptableLanguages() returns {}", acceptableLanguages); //$NON-NLS-1$
+ logger.trace("getAcceptableLanguages() returns {}", acceptableLanguages); //$NON-NLS-1$
return acceptableLanguages;
}
@@ -104,7 +104,7 @@ public class HttpHeadersImpl implements
Accept acceptHeader = getAcceptHeader();
acceptableMediaTypes = acceptHeader.getSortedMediaTypes();
}
- logger.debug("getAcceptableMediaTypes() returns {}", acceptableMediaTypes); //$NON-NLS-1$
+ logger.trace("getAcceptableMediaTypes() returns {}", acceptableMediaTypes); //$NON-NLS-1$
return acceptableMediaTypes;
}
@@ -113,7 +113,7 @@ public class HttpHeadersImpl implements
msgContext.getUriInfo().getQueryParameters()
.getFirst(RestConstants.REST_PARAM_MEDIA_TYPE);
String acceptValue = null;
- logger.debug("alternateParameter is {}", alternateParameter); //$NON-NLS-1$
+ logger.trace("alternateParameter is {}", alternateParameter); //$NON-NLS-1$
if (alternateParameter != null) {
// try to map alternate parameter shortcut to a real media type
// we're on the server, so this is a safe cast
@@ -121,14 +121,14 @@ public class HttpHeadersImpl implements
(DeploymentConfiguration)msgContext.getAttribute(WinkConfiguration.class);
Map<String, String> alternateShortcutMap =
deploymentConfiguration.getAlternateShortcutMap();
- logger.debug("alternateShortcutMap is {}", alternateShortcutMap); //$NON-NLS-1$
+ logger.trace("alternateShortcutMap is {}", alternateShortcutMap); //$NON-NLS-1$
if (alternateShortcutMap != null) {
acceptValue = alternateShortcutMap.get(alternateParameter);
}
if (acceptValue == null) {
acceptValue = alternateParameter;
}
- logger.debug("acceptValue set via alternateParameter is {}", acceptValue); //$NON-NLS-1$
+ logger.trace("acceptValue set via alternateParameter is {}", acceptValue); //$NON-NLS-1$
} else {
List<String> requestHeader = getRequestHeader(HttpHeaders.ACCEPT);
if (requestHeader == null || requestHeader.isEmpty()) {
@@ -146,12 +146,12 @@ public class HttpHeadersImpl implements
}
}
try {
- logger.debug("Accept header is: {}", acceptValue); //$NON-NLS-1$
+ logger.trace("Accept header is: {}", acceptValue); //$NON-NLS-1$
Accept acceptHeader = Accept.valueOf(acceptValue);
- logger.debug("getAcceptHeader() returns {}", acceptHeader); //$NON-NLS-1$
+ logger.trace("getAcceptHeader() returns {}", acceptHeader); //$NON-NLS-1$
return acceptHeader;
} catch (IllegalArgumentException e) {
- logger.debug("Illegal Accept request header: {}", e); //$NON-NLS-1$
+ logger.trace("Illegal Accept request header: {}", e); //$NON-NLS-1$
throw new WebApplicationException(e, 400);
}
}
@@ -167,7 +167,7 @@ public class HttpHeadersImpl implements
}
}
}
- logger.debug("Cookies are: {}", cookies); //$NON-NLS-1$
+ logger.trace("Cookies are: {}", cookies); //$NON-NLS-1$
return cookies;
}
@@ -182,15 +182,15 @@ public class HttpHeadersImpl implements
languageStr = s.get(0);
}
}
- logger.debug("Language string is {}", languageStr); //$NON-NLS-1$
+ logger.trace("Language string is {}", languageStr); //$NON-NLS-1$
if (languageStr == null) {
- logger.debug("getLanguage() returning null"); //$NON-NLS-1$
+ logger.trace("getLanguage() returning null"); //$NON-NLS-1$
return null;
}
String[] locales = StringUtils.fastSplit(languageStr, ","); //$NON-NLS-1$
language = HeaderUtils.languageToLocale(locales[0].trim());
}
- logger.debug("getLanguage() returning {}", language); //$NON-NLS-1$
+ logger.trace("getLanguage() returning {}", language); //$NON-NLS-1$
return language;
}
@@ -200,23 +200,23 @@ public class HttpHeadersImpl implements
if (contentType == null) {
List<String> s = getRequestHeaderInternal(HttpHeaders.CONTENT_TYPE);
if (s == null || s.isEmpty()) {
- logger.debug("getMediaType() returning null"); //$NON-NLS-1$
+ logger.trace("getMediaType() returning null"); //$NON-NLS-1$
return null;
} else {
contentType = s.get(0);
}
}
- logger.debug("Content-type is {}", contentType); //$NON-NLS-1$
+ logger.trace("Content-type is {}", contentType); //$NON-NLS-1$
mediaType = MediaType.valueOf(contentType);
}
- logger.debug("getMediaType() returning {}", mediaType); //$NON-NLS-1$
+ logger.trace("getMediaType() returning {}", mediaType); //$NON-NLS-1$
return mediaType;
}
private List<String> getRequestHeaderInternal(String name) {
if (allHeaders != null) {
List<String> value = allHeaders.get(name);
- logger.debug("Returning {} header value from allHeaders cache: {}", name, value); //$NON-NLS-1$
+ logger.trace("Returning {} header value from allHeaders cache: {}", name, value); //$NON-NLS-1$
return value;
}
@@ -232,27 +232,27 @@ public class HttpHeadersImpl implements
}
}
logger
- .debug("HttpServletRequest.getHeaders({}) returned {} so putting into headers cache", //$NON-NLS-1$
+ .trace("HttpServletRequest.getHeaders({}) returned {} so putting into headers cache", //$NON-NLS-1$
name,
list);
headers.put(name, list);
}
- logger.debug("getRequestHeaderInternal({}) returning {}", name, list); //$NON-NLS-1$
+ logger.trace("getRequestHeaderInternal({}) returning {}", name, list); //$NON-NLS-1$
return list;
}
public List<String> getRequestHeader(String name) {
if (name == null) {
- logger.debug("getRequestHeader({}) returns null", name); //$NON-NLS-1$
+ logger.trace("getRequestHeader({}) returns null", name); //$NON-NLS-1$
return null;
}
List<String> list = getRequestHeaderInternal(name);
if (list == null || list.isEmpty()) {
- logger.debug("getRequestHeader({}) returns null due to empty or non-existent header", //$NON-NLS-1$
+ logger.trace("getRequestHeader({}) returns null due to empty or non-existent header", //$NON-NLS-1$
name);
return null;
}
- logger.debug("getRequestHeader({}) returns {}", name, list); //$NON-NLS-1$
+ logger.trace("getRequestHeader({}) returns {}", name, list); //$NON-NLS-1$
return Collections.unmodifiableList(list);
}
@@ -284,7 +284,7 @@ public class HttpHeadersImpl implements
values.add(val);
}
}
- logger.debug("buildRequestHeaders() adding {} header with values {}", name, values); //$NON-NLS-1$
+ logger.trace("buildRequestHeaders() adding {} header with values {}", name, values); //$NON-NLS-1$
map.put(name, values);
}
return new UnmodifiableMultivaluedMap<String, String>(map);