svn commit: r1426141 - in /cxf/branches/2.6.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties

[ff...@apache.org]

Author: ffang
Date: Thu Dec 27 07:49:29 2012
New Revision: 1426141

URL: http://svn.apache.org/viewvc?rev=1426141&view=rev
Log:
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.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties
    cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1426140

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties?rev=1426141&r1=1426140&r2=1426141&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties (original)
+++ cxf/branches/2.6.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/Messages.properties Thu Dec 27 07:49:29 2012
@@ -22,7 +22,6 @@ NO_METHOD_FOR_OP=No method was found for
 INVALID_SCHEMA_URL=Could not load schema {0}
 ERROR_READING_SCHEMA=There was an error reading the schema {0}.
 COULD_NOT_FIND_PORTTYPE = Could not find portType named {0}
-NO_METHOD_FOR_OP = Could not find a matching method for operation {0}. Operation will be unavailable.
 COULD_NOT_SET_WRAPPER_STYLE = Service class: {0} contains overloaded operation can not use wrapper style
 USING_PROXY_FOR_SERVICE = Service class: {0} is a java.lang.reflect.Proxy instance.  This is known not to work well as \
   annotations on the real instance are not available.  We suggest overriding the ServiceClass via spring config or \

Modified: cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties?rev=1426141&r1=1426140&r2=1426141&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties (original)
+++ cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties Thu Dec 27 07:49:29 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.