Author: dkulp
Date: Mon Jan 31 20:46:28 2011
New Revision: 1065769
URL: http://svn.apache.org/viewvc?rev=1065769&view=rev
Log:
Merged revisions 1065148 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1065148 | bimargulies | 2011-01-29 18:45:57 -0500 (Sat, 29 Jan 2011) | 1 line
fix typos and spelling errors and missing substitution vars in messages in
JAX-RS.
........
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/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/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1065769&r1=1065768&r2=1065769&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
Mon Jan 31 20:46:28 2011
@@ -109,7 +109,7 @@ public final class JAXRSUtils {
private static final Logger LOG = LogUtils.getL7dLogger(JAXRSUtils.class);
private static final ResourceBundle BUNDLE =
BundleUtils.getBundle(JAXRSUtils.class);
- private static final String PROPOGATE_EXCEPTION =
"org.apache.cxf.propagate.exception";
+ private static final String PROPAGATE_EXCEPTION =
"org.apache.cxf.propagate.exception";
private JAXRSUtils() {
}
@@ -1184,7 +1184,7 @@ public final class JAXRSUtils {
public static boolean propogateException(Message m) {
- Object value = m.getContextualProperty(PROPOGATE_EXCEPTION);
+ Object value = m.getContextualProperty(PROPAGATE_EXCEPTION);
if (value == null) {
return true;
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=1065769&r1=1065768&r2=1065769&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
Mon Jan 31 20:46:28 2011
@@ -32,9 +32,9 @@ CLASS_VALUE_OF_FAILURE=Instance of class
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_OP_EXC=No operation matching request path {0} is found, HTTP Method : {1},
ContentType : {2}, Accept : {3}.
START_OPER_MATCH=Trying to select a resource operation on the resource class
{0}
-START_CRI_MATCH=Trying to select a resource class {0}, request path : {1}
+START_CRI_MATCH=Trying to select a resource class, request path : {0}
OPER_SELECTED_POSSIBLY=Resource operation {0} may get selected
OPER_SELECTED=Resource operation {0} on the resource class {1} has been
selected
OPER_NO_MATCH=No method match, method name : {0}, request path : {1}, method
@Path : {2}, HTTP Method : {3}, method HTTP Method : {4}, ContentType : {5},
method @Consumes : {6}, Accept : {7}, method @Produces : {8}.
