cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r831538 - in /cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring: BusApplicationContext.java Messages.properties
Date Sat, 31 Oct 2009 13:38:22 GMT
Author: bimargulies
Date: Sat Oct 31 13:38:21 2009
New Revision: 831538

URL: http://svn.apache.org/viewvc?rev=831538&view=rev
Log:
Stop frightening the horses with 'cxf.xml' not found, tell them about their file instead.
CXF-1148.

Modified:
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
    cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties

Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java?rev=831538&r1=831537&r2=831538&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java Sat
Oct 31 13:38:21 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/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties?rev=831538&r1=831537&r2=831538&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/spring/Messages.properties Sat Oct
31 13:38:21 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.



Mime
View raw message