Author: sergeyb
Date: Tue May 17 13:22:18 2011
New Revision: 1104232
URL: http://svn.apache.org/viewvc?rev=1104232&view=rev
Log:
Merged revisions 1104230 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1104230 | sergeyb | 2011-05-17 14:21:07 +0100 (Tue, 17 May 2011) | 1 line
[CXF-3509] Making NOT-FOUND messages a bit more informative
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/Messages.properties
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/Messages.properties
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 17 13:22:18 2011
@@ -1 +1 @@
-/cxf/trunk:1099767,1100898,1101399,1102198,1103904,1104144,1104180,1104217
+/cxf/trunk:1099767,1100898,1101399,1102198,1103904,1104144,1104180,1104217,1104230
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java?rev=1104232&r1=1104231&r2=1104232&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
Tue May 17 13:22:18 2011
@@ -142,7 +142,8 @@ public class JAXRSInInterceptor extends
if (resource == null) {
org.apache.cxf.common.i18n.Message errorMsg =
new org.apache.cxf.common.i18n.Message("NO_ROOT_EXC",
- BUNDLE,
+ BUNDLE,
+
message.get(Message.REQUEST_URI),
rawPath);
LOG.warning(errorMsg.toString());
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/Messages.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/Messages.properties?rev=1104232&r1=1104231&r2=1104232&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/Messages.properties
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/Messages.properties
Tue May 17 13:22:18 2011
@@ -20,5 +20,5 @@
#
SERIALIZE_ERROR = Error serializing the response, please check the server
logs, response class : {0}.
NO_MSG_WRITER = No message body writer has been found for response class {0}.
-NO_ROOT_EXC = No root resource matching request path {0} has been found.
+NO_ROOT_EXC = No root resource matching request path {0} has been found,
Relative Path: {1}. Please enable FINE/TRACE log level for more details.
HEAD_WITHOUT_ENTITY = Entity body returned by GET-supporting resource method
will be dropped as HEAD was the actual http request method
\ No newline at end of file
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java?rev=1104232&r1=1104231&r2=1104232&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/JAXRSUtils.java
Tue May 17 13:22:18 2011
@@ -392,6 +392,7 @@ public final class JAXRSUtils {
org.apache.cxf.common.i18n.Message errorMsg =
new org.apache.cxf.common.i18n.Message(name,
BUNDLE,
+
message.get(Message.REQUEST_URI),
path,
httpMethod,
requestType.toString(),
Modified:
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/Messages.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/Messages.properties?rev=1104232&r1=1104231&r2=1104232&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/Messages.properties
(original)
+++
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/Messages.properties
Tue May 17 13:22:18 2011
@@ -31,8 +31,8 @@ CLASS_CONSTRUCTOR_FAILURE=Class {0} can
CLASS_VALUE_OF_FAILURE=Instance of class {0} can not be created using static
valueOf(String) or fromString(String) methods
WRONG_PARAMETER_TYPE=Parameter Class {0} has no constructor with single String
parameter, static valueOf(String) or fromString(String) methods
NO_MSG_READER=No message body reader has been found for request class {0},
ContentType : {1}.
-NO_SUBRESOURCE_METHOD_FOUND=No operation matching request path {0} is found on
subresource, HTTP Method : {1}, ContentType : {2}, Accept : {3}.
-NO_OP_EXC=No operation matching request path {0} is found, HTTP Method : {1},
ContentType : {2}, Accept : {3}.
+NO_SUBRESOURCE_METHOD_FOUND=No operation matching request path "{0}" is found
on subresource, Relative Path: {1}, HTTP Method: {2}, ContentType: {3}, Accept:
{4}. Please enable FINE/TRACE log level for more details.
+NO_OP_EXC=No operation matching request path "{0}" is found, Relative Path:
{1}, HTTP Method: {2}, ContentType: {3}, Accept: {4}. Please enable FINE/TRACE
log level for more details.
START_OPER_MATCH=Trying to select a resource operation on the resource class
{0}
START_CRI_MATCH=Trying to select a resource class, request path : {0}
OPER_SELECTED_POSSIBLY=Resource operation {0} may get selected
