diff --git a/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar b/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar index b31e9d10c..a9757b350 100644 Binary files a/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar and b/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar differ diff --git a/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar b/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar index 1436ff75f..cf37b9ec0 100644 Binary files a/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar and b/lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar differ diff --git a/src/net/java/sip/communicator/impl/configuration/JdbcConfigService.java b/src/net/java/sip/communicator/impl/configuration/JdbcConfigService.java index b16e2eade..7ba362e52 100644 --- a/src/net/java/sip/communicator/impl/configuration/JdbcConfigService.java +++ b/src/net/java/sip/communicator/impl/configuration/JdbcConfigService.java @@ -22,6 +22,7 @@ import java.sql.*; import java.sql.Statement; import java.util.*; +import java.util.regex.Pattern; import org.jitsi.service.configuration.*; import org.jitsi.service.fileaccess.*; @@ -952,4 +953,34 @@ private void fireChange(String propertyName, l.propertyChange(evt); } } + + @Override + public void logConfigurationProperties(String excludePattern) + { + if (!logger.isInfoEnabled()) + return; + + Pattern exclusion = null; + if (!StringUtils.isNullOrEmpty(excludePattern)) + { + exclusion = Pattern.compile( + excludePattern, Pattern.CASE_INSENSITIVE); + } + + for (String p : getAllPropertyNames()) + { + Object v = getProperty(p); + + // Not sure if this can happen, but just in case... + if (v == null) + continue; + + if (exclusion != null && exclusion.matcher(p).find()) + { + v = "**********"; + } + + logger.info(p + "=" + v); + } + } }