Author: dkulp
Date: Sun Nov 1 03:10:35 2009
New Revision: 831633
URL: http://svn.apache.org/viewvc?rev=831633&view=rev
Log:
Merged revisions 831538 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r831538 | bimargulies | 2009-10-31 09:38:21 -0400 (Sat, 31 Oct 2009) | 1 line
Stop frightening the horses with 'cxf.xml' not found, tell them about their
file instead. CXF-1148.
........
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/BusApplicationContext.java
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/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java?rev=831633&r1=831632&r2=831633&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
Sun Nov 1 03:10:35 2009
@@ -144,14 +144,13 @@
Resource cpr = findResource(cfgFile);
if (cpr != null && cpr.exists()) {
resources.add(cpr);
+ LogUtils.log(LOG, Level.INFO, "USER_CFG_FILE_IN_USE", cfgFile);
} else {
if (!usingDefault) {
LogUtils.log(LOG, Level.WARNING,
"USER_CFG_FILE_NOT_LOADED", cfgFile);
String message = (new Message("USER_CFG_FILE_NOT_LOADED",
LOG, cfgFile)).toString();
throw new ApplicationContextException(message);
- } else {
- LogUtils.log(LOG, Level.INFO,
"USER_CFG_FILE_NOT_SPECIFIED_MSG", cfgFile);
- }
+ }
}
}
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=831633&r1=831632&r2=831633&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
Sun Nov 1 03:10:35 2009
@@ -19,7 +19,7 @@
#
#
USER_CFG_FILE_NOT_FOUND_MSG = Could not find the configuration file {0} on the
classpath.
-USER_CFG_FILE_NOT_SPECIFIED_MSG = No cxf.xml configuration file detected,
relying on defaults.
+USER_CFG_FILE_IN_USE= Loaded configuration file {0}.
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.
