Merge patch branch changes to main.

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/LDAPConnectionService.java

@@ -322,8 +322,7 @@ public class LDAPConnectionService {
             ldapConnection.close();
             logger.error("Binding with the LDAP server at \"{}\" as user "
                     + "\"{}\" failed: {}", config.getLdapHost(), bindUser,
-                    e.getMessage());
-            logger.debug("Unable to bind to LDAP server.", e);
+                    e.getMessage(), e);
             return null;
         }
 
@@ -369,8 +368,8 @@ public class LDAPConnectionService {
         }
         catch (LdapInvalidDnException e) {
             logger.error("Credentials of existing connection cannot be used. "
-                    + "The username used (\"{}\") is not a valid DN.", username);
-            logger.debug("Cannot bind using invalid DN.", e);
+                    + "The username used (\"{}\") is not a valid DN.",
+                    username, e);
             ldapConnection.close();
             return null;
         }

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/ObjectQueryService.java

@@ -265,8 +265,7 @@ public class ObjectQueryService {
                                             + "URL \"{}\".", url);
                             }
                             catch (GuacamoleException e) {
-                                logger.warn("Referral to \"{}\" could not be followed: {}", url, e.getMessage());
-                                logger.debug("Failed to follow LDAP referral.", e);
+                                logger.warn("Referral to \"{}\" could not be followed: {}", url, e.getMessage(), e);
                             }
 
                         }

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/ConfigurationService.java

@@ -122,7 +122,7 @@ public class ConfigurationService {
 
                 }
                 catch (IOException e) {
-                    logger.error("\"{}\" could not be read/parsed: {}", ldapServers, e.getMessage());
+                    logger.error("\"{}\" could not be read/parsed: {}", ldapServers, e.getMessage(), e);
                 }
             }
             else

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/connection/ConnectionService.java

@@ -202,8 +202,7 @@ public class ConnectionService {
                 }
                 catch (LdapInvalidAttributeValueException e) {
                     logger.error("Invalid value for {} attribute: {}",
-                            LDAP_ATTRIBUTE_NAME_ID, e.getMessage());
-                    logger.debug("LDAP exception while getting CN attribute.", e);
+                            LDAP_ATTRIBUTE_NAME_ID, e.getMessage(), e);
                     return null;
                 }
 
@@ -223,8 +222,7 @@ public class ConnectionService {
                     config.setProtocol(protocol.getString());
                 }
                 catch (LdapInvalidAttributeValueException e) {
-                    logger.error("Invalid value of the protocol entry: {}", e.getMessage());
-                    logger.debug("LDAP exception when getting protocol value.", e);
+                    logger.error("Invalid value of the protocol entry: {}", e.getMessage(), e);
                     return null;
                 }
                 
@@ -234,8 +232,7 @@ public class ConnectionService {
                     proxyConfig = getProxyConfiguration(entry);
                 }
                 catch (GuacamoleException e) {
-                    logger.error("Failed to retrieve proxy configuration.", e.getMessage());
-                    logger.debug("Guacamole Exception when retrieving proxy configuration.", e);
+                    logger.error("Failed to retrieve proxy configuration.", e.getMessage(), e);
                     return null;
                 }
 
@@ -250,8 +247,7 @@ public class ConnectionService {
                             parameter = parameterAttribute.getString();
                         }
                         catch (LdapInvalidAttributeValueException e) {
-                            logger.warn("Parameter value not valid for {}: {}", cnName, e.getMessage());
-                            logger.debug("LDAP exception when getting parameter value.", e);
+                            logger.warn("Parameter value not valid for {}: {}", cnName, e.getMessage(), e);
                             return null;
                         }
                         parameterAttribute.remove(parameter);
@@ -394,8 +390,7 @@ public class ConnectionService {
             return new GuacamoleProxyConfiguration(proxyHostname, proxyPort, proxyEncryption);
         }
         catch (LdapInvalidAttributeValueException e) {
-            logger.error("Invalid value in proxy configuration: {}", e.getMessage());
-            logger.debug("LDAP exception fetching proxy attribute value.", e);
+            logger.error("Invalid value in proxy configuration: {}", e.getMessage(), e);
             throw new GuacamoleServerException("Invalid LDAP value in proxy configuration.", e);
         }
     }

extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/group/UserGroupService.java

@@ -221,9 +221,7 @@ public class UserGroupService {
                 }
                 catch (LdapInvalidAttributeValueException e) {
                     logger.error("User group missing identifier: {}",
-                            e.getMessage());
-                    logger.debug("LDAP exception while getting "
-                            + "group identifier.", e);
+                            e.getMessage(), e);
                 }
             }
         }
@@ -309,8 +307,7 @@ public class UserGroupService {
             }
             catch (LdapInvalidAttributeValueException e) {
                 logger.error("User group missing identifier: {}",
-                        e.getMessage());
-                logger.debug("LDAP exception while getting group identifier.", e);
+                        e.getMessage(), e);
             }
 
         });

extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json

@@ -10,7 +10,6 @@
     ],
 
     "translations" : [
-        "translations/de.json",
         "translations/en.json",
         "translations/zh.json"
     ]