cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1429244 - in /cxf/branches/2.6.x-fixes: ./ api/src/main/java/org/apache/cxf/common/injection/Messages.properties
Date Sat, 05 Jan 2013 10:18:47 GMT
Author: ffang
Date: Sat Jan  5 10:18:47 2013
New Revision: 1429244

URL: http://svn.apache.org/viewvc?rev=1429244&view=rev
Log:
Merged revisions 1429242 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1429242 | ffang | 2013-01-05 18:12:43 +0800 (六, 05  1 2013) | 1 line
  
  [CXF-4730]unwanted {0} in the NO_SETTER_OR_FIELD_FOR_RESOURCE from cxf-api Messages.properties
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/injection/Messages.properties

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

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

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/injection/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/injection/Messages.properties?rev=1429244&r1=1429243&r2=1429244&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/injection/Messages.properties
(original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/common/injection/Messages.properties
Sat Jan  5 10:18:47 2013
@@ -29,5 +29,5 @@ PRE_DESTROY_NOT_VISIBLE=Method annotated
 PRE_DESTROY_THREW_EXCEPTION=Method annotated by @PreDestroy throws exception when invoked
 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
+NO_SETTER_OR_FIELD_FOR_RESOURCE=Resource annotation on {0} but no field or setter found.
+INJECTION_SETTER_METHOD_NOT_FOUND = Can''t find the injection setter method: {0}



Mime
View raw message