From eafab93cce7f73a144958e8cd9b991393fa689fb Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Sun, 11 Oct 2015 01:15:08 +0200
Subject: Update FMJ and libjitsi (Closes #160)

FMJ: r104
libjitsi: jitsi/libjitsi@9a1a4a7886991bb62dd629a434a31bf3b990d97a
---
 lib/installer-exclude/fmj-1.0-SNAPSHOT.jar         | Bin 1139897 -> 1138198 bytes
 lib/installer-exclude/libjitsi-1.0-SNAPSHOT.jar    | Bin 7703291 -> 7705340 bytes
 .../impl/configuration/JdbcConfigService.java      |  31 +++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar b/lib/installer-exclude/fmj-1.0-SNAPSHOT.jar
index b31e9d1..a9757b3 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 1436ff7..cf37b9e 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 b16e2ea..7ba362e 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.io.*;
 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 @@ public final class JdbcConfigService
             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);
+        }
+    }
 }
-- 
cgit v1.1