Author: ffang Date: Thu Dec 27 07:58:34 2012 New Revision: 1426143 URL: http://svn.apache.org/viewvc?rev=1426143&view=rev Log: Merged revisions 1426141 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
................ r1426141 | ffang | 2012-12-27 15:49:29 +0800 (四, 27 12 2012) | 9 lines Merged revisions 1426140 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1426140 | ffang | 2012-12-27 15:39:10 +0800 (四, 27 12 2012) | 1 line [CXF-4725]remove duplicated message key ........ ................ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1426140 Merged /cxf/branches/2.6.x-fixes:r1426141 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties?rev=1426143&r1=1426142&r2=1426143&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties Thu Dec 27 07:58:34 2012 @@ -23,7 +23,6 @@ INVALID_ENCODING_MSG = Invalid character NULL_RESPONSE_MSG = Response object is null DECOUPLED_RESPONSE_FAILED_MSG = Decouple response failed MISSING_PATH_INFO = PATH_INFO not present in message context, multiplex id is unavailable. Ensure the portName passed to getCurrentEndpointReferenceId is correct if the service has multiple ports -INVALID_ENCODING_MSG = Invalid character set {0} in request. INVALID_TIMEOUT_FORMAT = Invalid name/value pair {0}={1} set in RequestConext NO_HTTP_DESTINATION_FACTORY_FOUND = Cannot find any registered HttpDestinationFactory from the Bus. EXECUTOR_FULL = Executor rejected background task to retrieve the response, running on current thread.
