Revert loggers

Signed-off-by: Arjan Tijms <arjan.tijms@omnifish.ee>
eclipse-ee4j · Aug 2, 2023 · 0feb61c · 0feb61c
1 parent e9d4705
commit 0feb61c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/...curity/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java b/...curity/src/main/java/com/sun/enterprise/security/appclient/AppClientSecurityInfoImpl.java
@@ -16,7 +16,21 @@
 
 package com.sun.enterprise.security.appclient;
 
-import com.sun.enterprise.security.ee.J2EESecurityManager;
+import java.lang.System.Logger;
+import java.util.List;
+import java.util.logging.Level;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+
+import org.glassfish.appclient.client.acc.config.MessageSecurityConfig;
+import org.glassfish.appclient.client.acc.config.Security;
+import org.glassfish.appclient.client.acc.config.Ssl;
+import org.glassfish.appclient.client.acc.config.TargetServer;
+import org.glassfish.enterprise.iiop.api.IIOPSSLUtil;
+import org.jvnet.hk2.annotations.Service;
+import org.omnifaces.eleos.config.factory.file.AuthConfigFileFactory;
+
 import com.sun.enterprise.security.SecurityServicesUtil;
 import com.sun.enterprise.security.UsernamePasswordStore;
 import com.sun.enterprise.security.appclient.integration.AppClientSecurityInfo;
@@ -25,23 +39,12 @@
 import com.sun.enterprise.security.common.ClientSecurityContext;
 import com.sun.enterprise.security.common.SecurityConstants;
 import com.sun.enterprise.security.common.Util;
+import com.sun.enterprise.security.ee.J2EESecurityManager;
 import com.sun.enterprise.security.integration.AppClientSSL;
 import com.sun.enterprise.security.ssl.SSLUtils;
-import com.sun.logging.LogDomains;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
 import jakarta.inject.Inject;
-import javax.security.auth.Subject;
-import javax.security.auth.callback.CallbackHandler;
 import jakarta.security.auth.message.config.AuthConfigFactory;
-import org.glassfish.appclient.client.acc.config.MessageSecurityConfig;
-import org.glassfish.appclient.client.acc.config.Security;
-import org.glassfish.appclient.client.acc.config.Ssl;
-import org.glassfish.appclient.client.acc.config.TargetServer;
-import org.jvnet.hk2.annotations.Service;
-import org.omnifaces.eleos.config.factory.file.AuthConfigFileFactory;
-import org.glassfish.enterprise.iiop.api.IIOPSSLUtil;
 
 /**
  *
@@ -50,10 +53,7 @@
 @Service
 public class AppClientSecurityInfoImpl implements AppClientSecurityInfo {
 
-    private static Logger _logger=null;
-    static {
-        _logger=LogDomains.getLogger(AppClientSecurityInfoImpl.class, LogDomains.SECURITY_LOGGER);
-    }
+    private static final Logger LOG = System.getLogger(AppClientSecurityInfoImpl.class.getName());
 
     private static final String DEFAULT_PARSER_CLASS = "com.sun.enterprise.security.appclient.ConfigXMLParser";
 

diff --git a/...pclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java b/...pclient.security/src/main/java/com/sun/enterprise/security/appclient/ConfigXMLParser.java
@@ -23,13 +23,13 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.System.Logger;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -42,12 +42,10 @@
 import org.glassfish.internal.api.Globals;
 import org.omnifaces.eleos.config.factory.ConfigParser;
 import org.omnifaces.eleos.config.helper.AuthMessagePolicy;
-import org.omnifaces.eleos.config.module.configprovider.GFServerConfigProvider;
 import org.omnifaces.eleos.data.AuthModuleConfig;
 import org.omnifaces.eleos.data.AuthModulesLayerConfig;
 
 import com.sun.enterprise.security.common.Util;
-import com.sun.logging.LogDomains;
 
 import jakarta.security.auth.message.MessagePolicy;
 import jakarta.xml.bind.JAXBContext;
@@ -58,7 +56,7 @@
  * Parser for message-security-config in glassfish-acc.xml
  */
 public class ConfigXMLParser implements ConfigParser {
-    private static Logger _logger = LogDomains.getLogger(ConfigXMLParser.class, LogDomains.SECURITY_LOGGER);
+    private static final Logger LOG = System.getLogger(ConfigXMLParser.class.getName());
 
     private static Pattern PROPERTY_PATTERN = Pattern.compile("\\$\\{\\{(.*?)}}|\\$\\{(.*?)}");