You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2016/04/14 03:27:14 UTC
directory-fortress-core git commit: static names should be caps
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 77e05009e -> a1e493cfc
static names should be caps
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/a1e493cf
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/a1e493cf
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/a1e493cf
Branch: refs/heads/master
Commit: a1e493cfc4304e7bfbb83902a5dee1cc84c7af1f
Parents: 77e0500
Author: Shawn McKinney <sm...@apache.org>
Authored: Wed Apr 13 20:27:14 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Wed Apr 13 20:27:14 2016 -0500
----------------------------------------------------------------------
.../directory/fortress/core/util/Config.java | 21 ++++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/a1e493cf/src/main/java/org/apache/directory/fortress/core/util/Config.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/Config.java b/src/main/java/org/apache/directory/fortress/core/util/Config.java
index fa70fae..a9e51d3 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/Config.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/Config.java
@@ -52,8 +52,8 @@ import org.apache.directory.fortress.core.SecurityException;
*/
public final class Config
{
- private static final String propFile = "fortress.properties";
- private static final String userPropFile = "fortress.user.properties";
+ private static final String PROP_FILE = "fortress.properties";
+ private static final String USER_PROP_FILE = "fortress.user.properties";
private static final String EXT_LDAP_HOST = "fortress.host";
private static final String EXT_LDAP_PORT = "fortress.port";
private static final String EXT_LDAP_ADMIN_POOL_UID = "fortress.admin.user";
@@ -77,26 +77,25 @@ public final class Config
try
{
// Load the system config file.
- URL fUrl = Config.class.getClassLoader().getResource( propFile );
+ URL fUrl = Config.class.getClassLoader().getResource( PROP_FILE );
config = new PropertiesConfiguration();
config.setDelimiterParsingDisabled( true );
if ( fUrl == null )
{
- String error = "static init: Error, null cfg file: " + propFile;
+ String error = "static init: Error, null cfg file: " + PROP_FILE;
LOG.warn( error );
}
else
{
- LOG.info( "static init: found from: {} path: {}", propFile, fUrl.getPath() );
+ LOG.info( "static init: found from: {} path: {}", PROP_FILE, fUrl.getPath() );
config.load( fUrl );
- LOG.info( "static init: loading from: {}", propFile );
+ LOG.info( "static init: loading from: {}", PROP_FILE );
}
- URL fUserUrl = Config.class.getClassLoader().getResource( userPropFile );
+ URL fUserUrl = Config.class.getClassLoader().getResource( USER_PROP_FILE );
if ( fUserUrl != null )
{
- LOG.info( "static init: found user properties from: {} path: {}",
- userPropFile, fUserUrl.getPath() );
+ LOG.info( "static init: found user properties from: {} path: {}", USER_PROP_FILE, fUserUrl.getPath() );
config.load( fUserUrl );
}
@@ -126,14 +125,14 @@ public final class Config
}
catch ( org.apache.commons.configuration.ConfigurationException ex )
{
- String error = "static init: Error loading from cfg file: [" + propFile
+ String error = "static init: Error loading from cfg file: [" + PROP_FILE
+ "] ConfigurationException=" + ex;
LOG.error( error );
throw new CfgRuntimeException( GlobalErrIds.FT_CONFIG_BOOTSTRAP_FAILED, error, ex );
}
catch ( SecurityException se )
{
- String error = "static init: Error loading from cfg file: [" + propFile + "] SecurityException="
+ String error = "static init: Error loading from cfg file: [" + PROP_FILE + "] SecurityException="
+ se;
LOG.error( error );
throw new CfgRuntimeException( GlobalErrIds.FT_CONFIG_INITIALIZE_FAILED, error, se );