You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by cl...@apache.org on 2010/02/15 20:17:47 UTC
svn commit: r910311 - in /cxf/branches/2.2.x-fixes: ./
common/common/src/main/java/org/apache/cxf/common/injection/
integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/
rt/core/src/main/java/org/apache/cxf/configuration/spring/ rt/man...
Author: cleclerc
Date: Mon Feb 15 19:17:46 2010
New Revision: 910311
URL: http://svn.apache.org/viewvc?rev=910311&view=rev
Log:
Merged revisions 910308 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r910308 | cleclerc | 2010-02-15 20:09:36 +0100 (Mon, 15 Feb 2010) | 1 line
[CXF-2675] Single quotes must be doubled in message formats (ie in Message.properties resource bundles)
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/Messages.properties
cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/Messages.properties
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/Messages.properties
cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties
cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/Messages.properties
cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/Messages.properties
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 15 19:17:46 2010
@@ -1 +1 @@
-/cxf/trunk:909927-909933
+/cxf/trunk:909927-909933,910308
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/Messages.properties?rev=910311&r1=910310&r2=910311&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/Messages.properties (original)
+++ cxf/branches/2.2.x-fixes/common/common/src/main/java/org/apache/cxf/common/injection/Messages.properties Mon Feb 15 19:17:46 2010
@@ -30,4 +30,4 @@
SETTER_INJECTION_WITH_INCORRECT_TYPE=setter for resource found but with wrong signature: {0}
RESOURCE_NAME_NOT_SPECIFIED=Resource annotation on {0} must specify resource name
NO_SETTER_OR_FIELD_FOR_RESOURCE=Resource annotation {0} on {0} but no field or setter found.
-INJECTION_SETTER_METHOD_NOT_FOUND = Can't find the injection setter method: {0}
\ No newline at end of file
+INJECTION_SETTER_METHOD_NOT_FOUND = Can''t find the injection setter method: {0}
\ No newline at end of file
Modified: cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/Messages.properties?rev=910311&r1=910310&r2=910311&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/Messages.properties (original)
+++ cxf/branches/2.2.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/Messages.properties Mon Feb 15 19:17:46 2010
@@ -45,8 +45,8 @@
DESTROY_CALLED = destroy called on {0}
MATCHING_CONNECTIONS = Matching connections: matching {0} connections against request info: {1} {2}
MATCH_CONNECTION_AGAINST = Matching connections: compare {0} to {1}
-ADD_EVENT_LISTENER_CALLED = addConnectionEventListener called on '{0}', listener '{1}'
-ASSOCIATE_CONNECTION_CALLED = associateConnection called on '{0}', connection '{1}'
+ADD_EVENT_LISTENER_CALLED = addConnectionEventListener called on ''{0}'', listener ''{1}''
+ASSOCIATE_CONNECTION_CALLED = associateConnection called on ''{0}'', connection ''{1}''
SETTING_PROPERTY = Setting Property {0} with value {1}
Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/Messages.properties?rev=910311&r1=910310&r2=910311&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/Messages.properties (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/configuration/spring/Messages.properties Mon Feb 15 19:17:46 2010
@@ -22,5 +22,5 @@
COULD_NOT_DETERMINE_BEAN_NAME_MSG = Could not determine bean name for instance of class {0}.
ERROR_DETERMINING_BEAN_NAME_EXC = Failed to determine bean name.
JAXB_PROPERTY_EDITOR_EXC = Property editor failed to bind element {0}.
-WILDCARD_BEAN_ID_WITH_NO_CLASS_MSG = Configuration bean with id {0} that uses a '*' or wildcard must have a class attribute.
+WILDCARD_BEAN_ID_WITH_NO_CLASS_MSG = Configuration bean with id {0} that uses a ''*'' or wildcard must have a class attribute.
ONE_WILDCARD_BEAN_ID_PER_CLASS_MSG = A wildcard configuration bean with id {0} already exists for class {1}. The wildcard bean with id {2} will be ignored.
Modified: cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties?rev=910311&r1=910310&r2=910311&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties (original)
+++ cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/counters/Messages.properties Mon Feb 15 19:17:46 2010
@@ -19,7 +19,7 @@
#
#
CANNOT_FIND_THE_COUNTERREPOSITORY = CounterRepositoryMonitor can't find the CounterRepository from bus.
-CANNOT_CREATE_LOGGER_FILE = Can't create the logger file for the response time counters. {0}
-CANNOT_FIND_THE_COUNTER_OBJECTNAME = Can't find the counter object name. {0}
-CANNOT_FIND_STATUS = Can't find the status. {0}
-INSTRUMENTATION_REGISTER_FAULT_MSG=Can't register counter with object name {0}. {1}
+CANNOT_CREATE_LOGGER_FILE = Can''t create the logger file for the response time counters. {0}
+CANNOT_FIND_THE_COUNTER_OBJECTNAME = Can''t find the counter object name. {0}
+CANNOT_FIND_STATUS = Can''t find the status. {0}
+INSTRUMENTATION_REGISTER_FAULT_MSG=Can''t register counter with object name {0}. {1}
Modified: cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/Messages.properties?rev=910311&r1=910310&r2=910311&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/Messages.properties (original)
+++ cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/interceptor/Messages.properties Mon Feb 15 19:17:46 2010
@@ -19,5 +19,5 @@
#
#
CAN_NOT_GET_BUS_FROM_EXCHANGE = Can't get bus instance from exchange, using default bus instead
-CREATE_COUNTER_OBJECTNAME_FAILED = Create Counter's ObjectName failed. {0}
+CREATE_COUNTER_OBJECTNAME_FAILED = Create Counter''s ObjectName failed. {0}
NO_COUNTER_REPOSITORY = Can't find the CounterRepository from default Bus
\ No newline at end of file
Modified: cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/Messages.properties?rev=910311&r1=910310&r2=910311&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/Messages.properties (original)
+++ cxf/branches/2.2.x-fixes/rt/management/src/main/java/org/apache/cxf/management/utils/Messages.properties Mon Feb 15 19:17:46 2010
@@ -22,4 +22,4 @@
FAIL_TO_CONNECT_TO_MBEAN_SERVER = Failed to connect to the MBeanServer with url {0}
FAIL_TO_LIST_ENDPOINTS = Failed to list the endpoints, the exception is {0}.
FAIL_TO_CREATE_ENDPOINT_OBEJCTNAME = Failed to create the endpoints objectname, error is {0}
-FAIL_TO_INVOKE_MANAGED_OBJECT_OPERATION = Failed to invoke the managed object {0}'s operation {1}, the exception is {2}.
\ No newline at end of file
+FAIL_TO_INVOKE_MANAGED_OBJECT_OPERATION = Failed to invoke the managed object {0}''s operation {1}, the exception is {2}.
\ No newline at end of file
Modified: cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties?rev=910311&r1=910310&r2=910311&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties Mon Feb 15 19:17:46 2010
@@ -23,6 +23,6 @@
REMOVE_HANDLER_FAILED_MSG = Could not remove cxf jetty handler from Jetty server: {0}
CAN_NOT_FIND_HANDLER_MSG = Could not find the handler to remove for context url {0}
FAILED_TO_SHUTDOWN_ENGINE_MSG = Failed to shutdown Jetty server on port {0,number,####0} because it is still in use
-UNKNOWN_CONNECTOR_MSG = Unknown connector type {0}, can't set the socket reuseAddress flag.
+UNKNOWN_CONNECTOR_MSG = Unknown connector type {0}, can''t set the socket reuseAddress flag.
INVALID_ENCODING_MSG = Invalid character set {0} in request.
FALLBACK_THREADING_PARAMETERS_MSG = No explicitly configured threading parameters for port {0}, using fallback values min:{1} max:{2}