Author: dkulp
Date: Tue May 25 17:59:15 2010
New Revision: 948135
URL: http://svn.apache.org/viewvc?rev=948135&view=rev
Log:
Merged revisions 946521 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r946521 | gmazza | 2010-05-20 00:19:34 -0400 (Thu, 20 May 2010) | 2 lines
Misspelling fixed (CXF-2818)
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties?rev=948135&r1=948134&r2=948135&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
(original)
+++
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
Tue May 25 17:59:15 2010
@@ -23,5 +23,5 @@ USER_CFG_FILE_IN_USE= Loaded configurati
USER_CFG_FILE_URL_ERROR_MSG = The configuration file URL {0} is a a malformed
URL.
USER_CFG_FILE_URL_NOT_FOUND_MSG = Could not find the configuration file in the
url of {0}.
APP_CONTEXT_CREATION_FAILED_MSG = Failed to create application context.
-INITIAL_APP_CONTEXT_CREATION_FAILED_MSG = Initial attempt to crate application
context was unsuccessful.
+INITIAL_APP_CONTEXT_CREATION_FAILED_MSG = Initial attempt to create
application context was unsuccessful.
USER_CFG_FILE_NOT_LOADED=Failed to load configuration {0}