diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/util/BackupUtils.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/util/BackupUtils.java index 6aa9c18ee1a..03e0b78635a 100644 --- a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/util/BackupUtils.java +++ b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/util/BackupUtils.java @@ -19,7 +19,6 @@ import com.sun.enterprise.util.OS; import java.io.*; -import java.util.*; public class BackupUtils { diff --git a/appserver/admin/cli/src/main/java/org/glassfish/admin/cli/AsadminMain.java b/appserver/admin/cli/src/main/java/org/glassfish/admin/cli/AsadminMain.java index 3bbfbaefafd..d38d2572875 100644 --- a/appserver/admin/cli/src/main/java/org/glassfish/admin/cli/AsadminMain.java +++ b/appserver/admin/cli/src/main/java/org/glassfish/admin/cli/AsadminMain.java @@ -18,7 +18,6 @@ import com.sun.enterprise.admin.cli.AdminMain; import com.sun.enterprise.admin.cli.Environment; -import com.sun.enterprise.admin.remote.Metrix; /** * The asadmin main program. diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/LogViewHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/LogViewHandlers.java index eb3faf7fdc0..f0659f44c1f 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/LogViewHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/LogViewHandlers.java @@ -27,14 +27,10 @@ import java.text.ParseException; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import java.util.logging.Level; -import jakarta.ws.rs.core.MultivaluedHashMap; - import org.glassfish.admingui.common.util.GuiUtil; public class LogViewHandlers { diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/MonitoringHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/MonitoringHandlers.java index 16f4631f963..e5b5b125e2c 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/MonitoringHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/MonitoringHandlers.java @@ -31,14 +31,12 @@ import java.util.Map; import java.util.ArrayList; import java.text.DateFormat; -import java.text.NumberFormat; import java.util.Arrays; import java.util.Locale; import java.util.Date; import java.util.ListIterator; import java.util.logging.Level; -import org.glassfish.admingui.common.util.RestResponse; import org.glassfish.admingui.common.util.RestUtil; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ResourceHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ResourceHandlers.java index d5578f0335a..14d36dc3943 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ResourceHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ResourceHandlers.java @@ -16,7 +16,6 @@ package org.glassfish.admingui.common.handlers; -import java.io.UnsupportedEncodingException; import java.util.Map; import java.util.List; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestUtilHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestUtilHandlers.java index 537cb3ee7a8..c3fc847bad1 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestUtilHandlers.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestUtilHandlers.java @@ -37,8 +37,6 @@ import java.util.HashMap; import java.util.Map; import java.util.List; -import java.util.Locale; - import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogFilesContentSource.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogFilesContentSource.java index dfef8cd5eee..a845bdc314d 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogFilesContentSource.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/servlet/LogFilesContentSource.java @@ -26,9 +26,7 @@ import java.util.HashMap; import java.util.Map; -import jakarta.servlet.ServletRequest; import jakarta.servlet.http.HttpServletRequest; -import org.glassfish.admingui.common.util.GuiUtil; import org.glassfish.admingui.common.util.RestUtil; /** diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java index e6d06561878..922815a7cce 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java @@ -18,7 +18,6 @@ // import com.sun.jsftemplating.layout.event.EventObjectBase; -import com.sun.jsftemplating.layout.event.UIComponentHolder; import java.util.List; import jakarta.faces.component.UIComponent; diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java index 6a1335b561f..02996ae359e 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java +++ b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil2.java @@ -34,8 +34,6 @@ import com.sun.jsftemplating.annotation.HandlerOutput; import com.sun.jsftemplating.layout.descriptors.handler.HandlerContext; import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; /** diff --git a/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/handlers/JndiHandlers.java b/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/handlers/JndiHandlers.java index a0334857595..3583e2e446e 100644 --- a/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/handlers/JndiHandlers.java +++ b/appserver/admingui/full/src/main/java/org/glassfish/full/admingui/handlers/JndiHandlers.java @@ -37,8 +37,6 @@ import java.util.Map; import java.util.HashMap; -import java.util.Set; - public class JndiHandlers { diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetContent.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetContent.java index 988d05a7682..f0c8a2fe8c1 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetContent.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetContent.java @@ -18,9 +18,6 @@ import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; - -import java.util.List; /** diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModule.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModule.java index cc06885fdd7..074416fdef4 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModule.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModule.java @@ -16,7 +16,6 @@ package org.glassfish.admingui.connector; -import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; import org.jvnet.hk2.config.Element; diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModulePrefs.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModulePrefs.java index 6836045931e..06b4e1210c1 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModulePrefs.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModulePrefs.java @@ -18,9 +18,6 @@ import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; - -import java.util.List; /** diff --git a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetUserPref.java b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetUserPref.java index 02727f44bf5..20e4e786783 100644 --- a/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetUserPref.java +++ b/appserver/admingui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetUserPref.java @@ -18,9 +18,6 @@ import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; - -import java.util.List; /** diff --git a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java index 056dde46567..bc417a968ed 100644 --- a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java +++ b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java @@ -36,9 +36,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import com.sun.enterprise.module.ModulesRegistry; -import com.sun.enterprise.module.HK2Module; - import org.glassfish.admingui.connector.TOC; import org.glassfish.admingui.connector.TOCItem; import org.glassfish.admingui.connector.Index; diff --git a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/IntegrationPointComparator.java b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/IntegrationPointComparator.java index c59c69219f1..7ad66541ca2 100644 --- a/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/IntegrationPointComparator.java +++ b/appserver/admingui/plugin-service/src/main/java/org/glassfish/admingui/plugin/IntegrationPointComparator.java @@ -19,12 +19,7 @@ import java.io.Serializable; import java.util.Comparator; -import org.glassfish.admingui.connector.TOC; -import org.glassfish.admingui.connector.TOCItem; -import org.glassfish.admingui.connector.Index; -import org.glassfish.admingui.connector.IndexItem; import org.glassfish.admingui.connector.IntegrationPoint; -import org.glassfish.admingui.connector.ConsoleConfig; /** *

This class compares two {@link IntegrationPoint} Objects. See diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ClassFileAppClientInfo.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ClassFileAppClientInfo.java index 805c6a9802e..12dd16c2043 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ClassFileAppClientInfo.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/ClassFileAppClientInfo.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.util.logging.Logger; import org.glassfish.apf.AnnotationProcessorException; -import org.glassfish.api.deployment.archive.ReadableArchive; /** * Represents an app client specified by a .class file on the command line. diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/NestedAppClientInfo.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/NestedAppClientInfo.java index 864bdb7df47..a576c5dd48d 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/NestedAppClientInfo.java +++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/NestedAppClientInfo.java @@ -19,25 +19,15 @@ import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.ApplicationClientDescriptor; import com.sun.enterprise.deployment.archivist.Archivist; -import com.sun.enterprise.deployment.archivist.ApplicationArchivist; -import org.glassfish.deployment.common.ModuleDescriptor; import com.sun.enterprise.util.io.FileUtils; import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; import java.util.Enumeration; import java.util.Iterator; import java.util.Set; import java.util.ArrayList; import java.util.List; -import java.util.jar.Attributes; -import java.util.jar.JarFile; -import java.util.jar.Manifest; import java.util.logging.Logger; import org.glassfish.api.deployment.archive.ReadableArchive; -import org.glassfish.deployment.common.ModuleExploder; /** * Represents an app client that is nested inside an enterprise app. diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/ApplicationSignedJARManager.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/ApplicationSignedJARManager.java index 24527b73f19..ca0bd47fa08 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/ApplicationSignedJARManager.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/ApplicationSignedJARManager.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Set; import java.util.jar.Attributes; -import java.util.jar.JarFile; import java.util.jar.Manifest; import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.api.deployment.archive.ReadableArchive; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/NestedAppClientDeployerHelper.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/NestedAppClientDeployerHelper.java index 7af6d95e8ba..6df390367f6 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/NestedAppClientDeployerHelper.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/NestedAppClientDeployerHelper.java @@ -25,7 +25,6 @@ import com.sun.enterprise.deployment.deploy.shared.OutputJarArchive; import com.sun.enterprise.deployment.deploy.shared.Util; import org.glassfish.deployment.common.ModuleDescriptor; -import com.sun.logging.LogDomains; import java.io.File; import java.io.FileFilter; import java.io.IOException; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ClientJNLPConfigData.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ClientJNLPConfigData.java index 2a340664670..76ffaa27cf7 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ClientJNLPConfigData.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/ClientJNLPConfigData.java @@ -16,7 +16,6 @@ package org.glassfish.appclient.server.core.jws; -import com.sun.logging.LogDomains; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/NamingConventions.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/NamingConventions.java index 70ecd3053c1..2884b80ae8d 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/NamingConventions.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/NamingConventions.java @@ -18,7 +18,6 @@ import com.sun.enterprise.deployment.ApplicationClientDescriptor; import com.sun.enterprise.deployment.runtime.JavaWebStartAccessDescriptor; -import org.glassfish.appclient.server.core.AppClientServerApplication; /** * diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/RestrictedContentAdapter.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/RestrictedContentAdapter.java index bae948c9ea3..5961f783278 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/RestrictedContentAdapter.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/RestrictedContentAdapter.java @@ -24,7 +24,6 @@ import java.util.logging.Logger; import jakarta.servlet.http.HttpServletResponse; -import com.sun.logging.LogDomains; import java.net.URI; import org.glassfish.appclient.server.core.jws.servedcontent.Content; import org.glassfish.appclient.server.core.jws.servedcontent.StaticContent; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/XPathToDeveloperProvidedContentRefs.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/XPathToDeveloperProvidedContentRefs.java index 1d944527414..3401b7464b1 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/XPathToDeveloperProvidedContentRefs.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/XPathToDeveloperProvidedContentRefs.java @@ -16,11 +16,8 @@ package org.glassfish.appclient.server.core.jws; -import com.sun.logging.LogDomains; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; import java.net.URLConnection; @@ -40,7 +37,6 @@ import org.glassfish.appclient.server.core.StandaloneAppClientDeployerHelper; import org.glassfish.appclient.server.core.jws.servedcontent.Content; import org.glassfish.appclient.server.core.jws.servedcontent.DynamicContent; -import org.glassfish.appclient.server.core.jws.servedcontent.FixedContent; import org.glassfish.appclient.server.core.jws.servedcontent.SimpleDynamicContentImpl; import org.glassfish.appclient.server.core.jws.servedcontent.StaticContent; import org.glassfish.logging.annotation.LogMessageInfo; diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/CachingDynamicContentImpl.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/CachingDynamicContentImpl.java index 6aa70934189..44ac4988d21 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/CachingDynamicContentImpl.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/CachingDynamicContentImpl.java @@ -19,7 +19,6 @@ import java.util.LinkedList; import java.util.Properties; import org.glassfish.appclient.server.core.jws.Util; -import org.glassfish.appclient.server.core.jws.servedcontent.DynamicContent.InstanceAdapter; /** * diff --git a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/FixedContent.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/FixedContent.java index 8cb3573a714..0570a8f375f 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/FixedContent.java +++ b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/FixedContent.java @@ -16,7 +16,6 @@ package org.glassfish.appclient.server.core.jws.servedcontent; -import com.sun.logging.LogDomains; import java.io.File; import java.io.IOException; import java.util.logging.Level; diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java index c96eb1073ba..8127af586d6 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java @@ -16,20 +16,13 @@ package org.glassfish.batch; -import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.SystemPropertyConstants; import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.admin.*; -import org.glassfish.config.support.CommandTarget; -import org.glassfish.config.support.TargetType; -import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.Target; -import org.jvnet.hk2.annotations.Service; - import jakarta.inject.Inject; import java.util.Properties; import java.util.logging.Level; diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java index e899baa21eb..097138717e8 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java @@ -17,8 +17,6 @@ package org.glassfish.batch; import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; -import com.sun.enterprise.util.SystemPropertyConstants; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; import org.glassfish.api.Param; @@ -26,14 +24,9 @@ import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.Target; import org.jvnet.hk2.annotations.Service; -import jakarta.inject.Inject; import java.util.Properties; -import java.util.logging.Level; -import java.util.logging.Logger; /** * Command to list batch jobs info diff --git a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java index 46e94668d05..7da838d8404 100644 --- a/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java +++ b/appserver/batch/glassfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java @@ -17,12 +17,10 @@ package org.glassfish.batch; import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.util.ColumnFormatter; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; -import org.glassfish.api.Param; import org.glassfish.api.admin.*; import org.glassfish.batch.spi.impl.BatchRuntimeConfiguration; import org.glassfish.batch.spi.impl.BatchRuntimeHelper; diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeConfiguration.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeConfiguration.java index 2f384d9d1b2..d9911e713ed 100644 --- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeConfiguration.java +++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeConfiguration.java @@ -20,7 +20,6 @@ import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.Element; /** * @author Mahesh Kannan diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java index 95d8291f82c..511d1ce3e0e 100644 --- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java +++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java @@ -35,13 +35,10 @@ import org.glassfish.internal.deployment.Deployment; import org.jvnet.hk2.annotations.Service; -import jakarta.batch.operations.JobOperator; -import jakarta.batch.runtime.BatchRuntime; import jakarta.inject.Inject; import jakarta.inject.Named; import javax.naming.InitialContext; import javax.naming.NamingException; -import java.net.URL; import java.util.*; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java index e29ca802af3..4430d06730a 100644 --- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java +++ b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java @@ -18,10 +18,8 @@ import com.ibm.jbatch.spi.BatchSecurityHelper; import com.sun.enterprise.config.serverbeans.Config; -import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.api.invocation.ComponentInvocation; import org.glassfish.api.invocation.InvocationManager; -import org.glassfish.internal.api.Target; import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/DASJ2EEServerImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/DASJ2EEServerImpl.java index a40ad3ff565..3fe27ccf501 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/DASJ2EEServerImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/DASJ2EEServerImpl.java @@ -16,7 +16,6 @@ package org.glassfish.admin.amx.impl.j2ee; -import java.lang.reflect.Constructor; import javax.management.Notification; import javax.management.NotificationListener; import javax.management.ObjectName; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDomainImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDomainImpl.java index 4d384d20d47..0ac0e4150de 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDomainImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDomainImpl.java @@ -16,7 +16,6 @@ package org.glassfish.admin.amx.impl.j2ee; -import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; import org.glassfish.admin.amx.core.Util; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java index 24b4260a664..19db248c9cd 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java @@ -22,9 +22,6 @@ import java.util.Set; import javax.management.MBeanServer; import javax.management.ObjectName; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.rmi.PortableRemoteObject; import com.sun.enterprise.config.serverbeans.Domain; import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.impl.mbean.AMXImplBase; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEModuleImplBase.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEModuleImplBase.java index 0b7afede2dc..3c1c1a2e0cf 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEModuleImplBase.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEModuleImplBase.java @@ -16,11 +16,9 @@ package org.glassfish.admin.amx.impl.j2ee; -import javax.management.MBeanServer; import org.glassfish.admin.amx.j2ee.J2EEModule; import javax.management.ObjectName; -import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.j2ee.J2EETypes; /** diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCResourceImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCResourceImpl.java index 0c8bcad75b5..45a2b004125 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCResourceImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/JDBCResourceImpl.java @@ -21,7 +21,6 @@ import javax.management.ObjectName; import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; import org.glassfish.admin.amx.j2ee.J2EETypes; -import org.glassfish.admin.amx.j2ee.JDBCDataSource; public final class JDBCResourceImpl extends J2EEResourceImplBase { public static final Class INTF = JDBCResource.class; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RegistrationSupport.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RegistrationSupport.java index eeece55c41e..a783dfc5f4b 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RegistrationSupport.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/RegistrationSupport.java @@ -74,7 +74,6 @@ import org.glassfish.admin.amx.j2ee.StatelessSessionBean; import org.glassfish.admin.amx.j2ee.WebModule; import org.glassfish.admin.amx.util.ClassUtil; -import org.glassfish.admin.amx.util.MapUtil; import org.glassfish.admin.amx.util.jmx.JMXUtil; import org.glassfish.api.admin.config.Named; import org.glassfish.internal.data.ApplicationInfo; diff --git a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ServletImpl.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ServletImpl.java index 8b32671bb69..f58f5ced0bc 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ServletImpl.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/ServletImpl.java @@ -19,7 +19,6 @@ import org.glassfish.admin.amx.j2ee.Servlet; import javax.management.ObjectName; -import org.glassfish.admin.amx.j2ee.J2EEManagedObject; public final class ServletImpl extends J2EEManagedObjectImplBase // implements Servlet diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerFactoryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerFactoryWrapper.java index db9cfa97b19..b311090022e 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerFactoryWrapper.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerFactoryWrapper.java @@ -28,9 +28,12 @@ import jakarta.persistence.EntityGraph; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnitTransactionType; import jakarta.persistence.PersistenceUnitUtil; import jakarta.persistence.Query; +import jakarta.persistence.SchemaManager; import jakarta.persistence.SynchronizationType; +import jakarta.persistence.TypedQueryReference; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.metamodel.Metamodel; @@ -39,6 +42,8 @@ import java.io.Serializable; import java.util.Map; import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Function; import java.util.logging.Logger; import org.glassfish.api.invocation.ComponentInvocation; @@ -161,6 +166,41 @@ public void addNamedEntityGraph(String graphName, EntityGraph entityGraph getDelegate().addNamedEntityGraph(graphName, entityGraph); } + @Override + public R callInTransaction(Function work) { + return getDelegate().callInTransaction(work); + } + + @Override + public String getName() { + return getDelegate().getName(); + } + + @Override + public Map> getNamedEntityGraphs(Class entityType) { + return getDelegate().getNamedEntityGraphs(entityType); + } + + @Override + public Map> getNamedQueries(Class resultType) { + return getDelegate().getNamedQueries(resultType); + } + + @Override + public SchemaManager getSchemaManager() { + return getDelegate().getSchemaManager(); + } + + @Override + public PersistenceUnitTransactionType getTransactionType() { + return getDelegate().getTransactionType(); + } + + @Override + public void runInTransaction(Consumer work) { + getDelegate().runInTransaction(work); + } + /** * Lookup physical EntityManagerFactory based on current component diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerWrapper.java index 2e892e36eaa..57929a1fa73 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerWrapper.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/EntityManagerWrapper.java @@ -23,22 +23,30 @@ import com.sun.enterprise.container.common.spi.util.EntityManagerMethod; import com.sun.enterprise.transaction.api.JavaEETransaction; import com.sun.logging.LogDomains; - +import jakarta.persistence.CacheRetrieveMode; +import jakarta.persistence.CacheStoreMode; +import jakarta.persistence.ConnectionConsumer; +import jakarta.persistence.ConnectionFunction; import jakarta.persistence.EntityGraph; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; +import jakarta.persistence.FindOption; import jakarta.persistence.FlushModeType; import jakarta.persistence.LockModeType; +import jakarta.persistence.LockOption; import jakarta.persistence.PersistenceContextType; import jakarta.persistence.Query; +import jakarta.persistence.RefreshOption; import jakarta.persistence.StoredProcedureQuery; import jakarta.persistence.SynchronizationType; import jakarta.persistence.TransactionRequiredException; import jakarta.persistence.TypedQuery; +import jakarta.persistence.TypedQueryReference; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaDelete; import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaSelect; import jakarta.persistence.criteria.CriteriaUpdate; import jakarta.persistence.metamodel.Metamodel; import jakarta.transaction.TransactionManager; @@ -1225,4 +1233,74 @@ public void beforePostInvoke(ComponentInvocation.ComponentInvocationType invType public void afterPostInvoke(ComponentInvocation.ComponentInvocationType invType, ComponentInvocation prevInv, ComponentInvocation curInv) throws InvocationException { } } + + // TODO ADD callflow! + + @Override + public T find(Class entityClass, Object primaryKey, FindOption... options) { + // TODO ADD callflow + return _getDelegate().find(entityClass, primaryKey, options); + } + + @Override + public T find(EntityGraph entityGraph, Object primaryKey, FindOption... options) { + return _getDelegate().find(entityGraph, primaryKey, options); + } + + @Override + public T getReference(T entity) { + return _getDelegate().getReference(entity); + } + + @Override + public void lock(Object entity, LockModeType lockMode, LockOption... options) { + _getDelegate().lock(entity, lockMode, options); + + } + + @Override + public void refresh(Object entity, RefreshOption... options) { + _getDelegate().refresh(entity, options); + } + + @Override + public void setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) { + _getDelegate().setCacheRetrieveMode(cacheRetrieveMode); + } + + @Override + public void setCacheStoreMode(CacheStoreMode cacheStoreMode) { + _getDelegate().setCacheStoreMode(cacheStoreMode); + } + + @Override + public CacheRetrieveMode getCacheRetrieveMode() { + return _getDelegate().getCacheRetrieveMode(); + } + + @Override + public CacheStoreMode getCacheStoreMode() { + return _getDelegate().getCacheStoreMode(); + } + + @Override + public TypedQuery createQuery(CriteriaSelect selectQuery) { + return _getDelegate().createQuery(selectQuery); + } + + @Override + public TypedQuery createQuery(TypedQueryReference reference) { + return _getDelegate().createQuery(reference); + } + + @Override + public void runWithConnection(ConnectionConsumer action) { + _getDelegate().runWithConnection(action); + } + + @Override + public T callWithConnection(ConnectionFunction function) { + return _getDelegate().callWithConnection(function); + } + } diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java index 58e61dd6636..4702b9d2f55 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/QueryWrapper.java @@ -52,6 +52,7 @@ protected QueryWrapper(T qDelegate, EntityManager emDelegate) } + @Override public List getResultList() { try { if(callFlowAgent.isEnabled()) { @@ -67,6 +68,7 @@ public List getResultList() { } } + @Override public Object getSingleResult() { try { if(callFlowAgent.isEnabled()) { @@ -82,6 +84,7 @@ public Object getSingleResult() { } } + @Override public int executeUpdate() { if(callFlowAgent.isEnabled()) { callFlowAgent.entityManagerQueryStart(EntityManagerQueryMethod.EXECUTE_UPDATE); @@ -90,6 +93,7 @@ public int executeUpdate() { throw new TransactionRequiredException("executeUpdate is not supported for a Query object obtained through non-transactional access of a container-managed transactional EntityManager"); } + @Override public Query setMaxResults(int maxResults) { try { @@ -111,6 +115,7 @@ public Query setMaxResults(int maxResults) { return this; } + @Override public int getMaxResults() { try { @@ -127,6 +132,7 @@ public int getMaxResults() { } } + @Override public Query setFirstResult(int startPosition) { try { @@ -149,6 +155,7 @@ public Query setFirstResult(int startPosition) { return this; } + @Override public int getFirstResult() { try { @@ -165,6 +172,7 @@ public int getFirstResult() { } } + @Override public Query setHint(String hintName, Object value) { try { @@ -182,6 +190,7 @@ public Query setHint(String hintName, Object value) { return this; } + @Override public Map getHints() { try { @@ -198,6 +207,7 @@ public Map getHints() { } } + @Override public Query setParameter(Parameter param, T value) { try { @@ -215,6 +225,7 @@ public Query setParameter(Parameter param, T value) { return this; } + @Override public Query setParameter(Parameter param, Date value, TemporalType temporalType) { try { @@ -232,6 +243,7 @@ public Query setParameter(Parameter param, Date value, TemporalType tempo return this; } + @Override public Query setParameter(Parameter param, Calendar value, TemporalType temporalType) { try { @@ -251,6 +263,7 @@ public Query setParameter(Parameter param, Calendar value, TemporalTy + @Override public Query setParameter(String name, Object value) { try { @@ -268,6 +281,7 @@ public Query setParameter(String name, Object value) { return this; } + @Override public Query setParameter(String name, Date value, TemporalType temporalType) { @@ -285,6 +299,7 @@ public Query setParameter(String name, Date value, return this; } + @Override public Query setParameter(String name, Calendar value, TemporalType temporalType) { try { @@ -300,6 +315,7 @@ public Query setParameter(String name, Calendar value, return this; } + @Override public Query setParameter(int position, Object value) { try { @@ -316,6 +332,7 @@ public Query setParameter(int position, Object value) { return this; } + @Override public Query setParameter(int position, Date value, TemporalType temporalType) { @@ -333,6 +350,7 @@ public Query setParameter(int position, Date value, return this; } + @Override public Query setParameter(int position, Calendar value, TemporalType temporalType) { @@ -350,6 +368,7 @@ public Query setParameter(int position, Calendar value, return this; } + @Override public Set> getParameters() { try { @@ -366,6 +385,7 @@ public Set> getParameters() { } } + @Override public Parameter getParameter(String name) { try { @@ -382,6 +402,7 @@ public Parameter getParameter(String name) { } } + @Override public Parameter getParameter(String name, Class type) { try { @@ -398,6 +419,7 @@ public Parameter getParameter(String name, Class type) { } } + @Override public Parameter getParameter(int position) { try { @@ -414,6 +436,7 @@ public Parameter getParameter(int position) { } } + @Override public Parameter getParameter(int position, Class type) { try { @@ -430,6 +453,7 @@ public Parameter getParameter(int position, Class type) { } } + @Override public boolean isBound(Parameter param) { try { @@ -446,6 +470,7 @@ public boolean isBound(Parameter param) { } } + @Override public T getParameterValue(Parameter param) { try { @@ -462,6 +487,7 @@ public T getParameterValue(Parameter param) { } } + @Override public Object getParameterValue(String name) { try { @@ -478,6 +504,7 @@ public Object getParameterValue(String name) { } } + @Override public Object getParameterValue(int position) { try { @@ -494,6 +521,7 @@ public Object getParameterValue(int position) { } } + @Override public Query setFlushMode(FlushModeType flushMode) { try { @@ -511,6 +539,7 @@ public Query setFlushMode(FlushModeType flushMode) { return this; } + @Override public FlushModeType getFlushMode() { try { @@ -527,6 +556,7 @@ public FlushModeType getFlushMode() { } } + @Override public Query setLockMode(LockModeType lockModeType) { try { if(callFlowAgent.isEnabled()) { @@ -543,6 +573,7 @@ public Query setLockMode(LockModeType lockModeType) { return this; } + @Override public LockModeType getLockMode() { try { @@ -559,6 +590,7 @@ public LockModeType getLockMode() { } } + @Override public T unwrap(Class tClass) { try { @@ -575,5 +607,48 @@ public T unwrap(Class tClass) { } } + // TODO ADD callflow + + @Override + public Object getSingleResultOrNull() { + return queryDelegate.getSingleResult(); + } + + + @Override + public Query setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) { + return queryDelegate.setCacheRetrieveMode(cacheRetrieveMode); + } + + + @Override + public Query setCacheStoreMode(CacheStoreMode cacheStoreMode) { + return queryDelegate.setCacheStoreMode(cacheStoreMode); + } + + + @Override + public CacheRetrieveMode getCacheRetrieveMode() { + return queryDelegate.getCacheRetrieveMode(); + } + + + @Override + public CacheStoreMode getCacheStoreMode() { + return queryDelegate.getCacheStoreMode(); + } + + + @Override + public Query setTimeout(Integer timeout) { + return queryDelegate.setTimeout(timeout); + } + + + @Override + public Integer getTimeout() { + return queryDelegate.getTimeout(); + } + } diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java index 1d97f7feded..1ee2b579dd2 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/StoreProcedureQueryWrapper.java @@ -39,6 +39,24 @@ private StoreProcedureQueryWrapper(StoredProcedureQuery qDelegate, EntityManager super(qDelegate, emDelegate); } + @Override + public StoredProcedureQuery setCacheStoreMode(CacheStoreMode cacheStoreMode) { + super.setCacheStoreMode(cacheStoreMode); + return this; + } + + @Override + public StoredProcedureQuery setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) { + super.setCacheRetrieveMode(cacheRetrieveMode); + return this; + } + + @Override + public StoredProcedureQuery setTimeout(Integer timeout) { + super.setTimeout(timeout); + return this; + } + @Override public StoredProcedureQuery setHint(String hintName, Object value) { super.setHint(hintName, value); diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/TypedQueryWrapper.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/TypedQueryWrapper.java index 4958838bf79..dbae69f53cc 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/TypedQueryWrapper.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/TypedQueryWrapper.java @@ -41,12 +41,36 @@ private TypedQueryWrapper(TypedQuery qDelegate, EntityManager emDelegate) { } + @Override + public TypedQuery setTimeout(Integer timeout) { + super.setTimeout(timeout); + return this; + } + + @Override + public TypedQuery setCacheRetrieveMode(CacheRetrieveMode cacheRetrieveMode) { + super.setCacheRetrieveMode(cacheRetrieveMode); + return this; + } + + @Override + public TypedQuery setCacheStoreMode(CacheStoreMode cacheStoreMode) { + super.setCacheStoreMode(cacheStoreMode); + return this; + } + + @SuppressWarnings("unchecked") + @Override + public X getSingleResultOrNull() { + return (X) super.getSingleResultOrNull(); + } + @SuppressWarnings("unchecked") @Override public List getResultList() { // If this method is called, the current instance is guarantied to be of type TypedQuery // It is safe to cast here. - return (List) super.getResultList(); + return super.getResultList(); } @SuppressWarnings("unchecked") diff --git a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/GlassFishOutputStreamHandler.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/GlassFishOutputStreamHandler.java index 15b4544e732..79d6300e765 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/GlassFishOutputStreamHandler.java +++ b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/spi/util/GlassFishOutputStreamHandler.java @@ -17,8 +17,6 @@ package com.sun.enterprise.container.common.spi.util; import java.io.IOException; -import java.io.Serializable; - import org.jvnet.hk2.annotations.Contract; /** diff --git a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/AverageRangeStatisticImpl.java b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/AverageRangeStatisticImpl.java index 379d884acef..623cf444a99 100755 --- a/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/AverageRangeStatisticImpl.java +++ b/appserver/common/stats77/src/main/java/com/sun/enterprise/admin/monitor/stats/AverageRangeStatisticImpl.java @@ -16,8 +16,6 @@ package com.sun.enterprise.admin.monitor.stats; -import org.glassfish.j2ee.statistics.BoundedRangeStatistic; - /** An implementation of a AverageRangeStatistic. All instances of this class are * immutable. Provides all the necessary accessors for properties. * @author Larry White diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml index e6ec50fa23a..b73c9933fcf 100644 --- a/appserver/concurrent/concurrent-impl/pom.xml +++ b/appserver/concurrent/concurrent-impl/pom.xml @@ -1,7 +1,7 @@ diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml index de3d0bd9af9..89364168e2f 100644 --- a/appserver/featuresets/web/pom.xml +++ b/appserver/featuresets/web/pom.xml @@ -1,7 +1,7 @@ - 4.1.0-M1 - 4.1.0-M1 + 4.1.0-M2 + 4.1.0-M2 2.2.0-M1 - 2.1.5 + 2.2.0-M1 - 3.1.0-M1 - 3.1.0-M1 + 3.1.0-M2 + 3.1.0-M3 - 2.2.0-M1 + 2.2.0 + + 4.0.0-M1 + 3.0.0-M1 + 3.1.0-M1 + 4.0.0-M1 3.0.0-M1.1 3.1.0-M1 - 9.37 + + 9.38-rc3 1.0.2 @@ -107,8 +113,8 @@ 6.4.0 - 3.1.0 - 4.0.2 + 3.2.0-M2 + 5.0.0-B01 9.6.0 @@ -126,25 +132,25 @@ 2.1.3 - 1.1.5 - 1.1.5 - 3.0.0 + 1.1.6 + 1.1.6 + 3.0.1 3.0.3 - 4.0.0-M1 + 4.0.0-M2 3.0.0 4.0.0-M1 4.0.2 - 6.6.0 + 6.6.1 4.2.2 - 4.1.0-M1 - 6.0.0.Alpha1 - 1.3.0.Final + 4.1.0 + 6.0.0.Beta1 + 1.3.1.Final 2.1.0 @@ -152,7 +158,7 @@ 3.1 - 4.0.2 + 4.0.5 2.1 @@ -228,8 +234,8 @@ ${jakarta.concurrent-api.version} - org.glassfish - jakarta.enterprise.concurrent + org.glassfish.concurro + concurro ${concurro.version} @@ -251,6 +257,27 @@ + + jakarta.security.enterprise + jakarta.security.enterprise-api + ${jakarta.security-api.version} + + + jakarta.authentication + jakarta.authentication-api + ${jakarta.authentication-api.version} + + + jakarta.authorization + jakarta.authorization-api + ${jakarta.authorization-api.version} + + + jakarta.servlet + jakarta.servlet-api + + + org.glassfish.soteria jakarta.security.enterprise @@ -522,8 +549,6 @@ - - org.jboss.weld weld-osgi-bundle @@ -744,7 +769,7 @@

${stage.dir}/${install.dir.name}/glassfish/modules jakarta*.jar - jakarta.inject-api.jar,jakarta.servlet.jsp.jstl.jar,wasp.jar,jakarta.enterprise.concurrent.jar, + jakarta.inject-api.jar,jakarta.servlet.jsp.jstl.jar,wasp.jar,concurro.jar, jakarta.persistence.jar diff --git a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java index 82ed8828f77..ba27ddac7bd 100644 --- a/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java +++ b/appserver/resources/resources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourceFactory.java @@ -24,7 +24,6 @@ import org.glassfish.hk2.api.PerLookup; import jakarta.inject.Inject; -import jakarta.inject.Provider; /** * diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityUtil.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityUtil.java index 93d41e28aff..3dda38cc54b 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityUtil.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/SecurityUtil.java @@ -18,15 +18,6 @@ import static org.glassfish.deployment.versioning.VersioningUtils.getRepositoryName; -import java.security.Policy; -import java.util.Collection; -import java.util.logging.Logger; - -import org.glassfish.api.deployment.DeploymentContext; -import org.glassfish.api.deployment.OpsParams; -import org.glassfish.deployment.common.SecurityRoleMapperFactory; -import org.glassfish.deployment.versioning.VersioningUtils; - import com.sun.enterprise.deployment.Application; import com.sun.enterprise.deployment.EjbBundleDescriptor; import com.sun.enterprise.deployment.WebBundleDescriptor; @@ -34,10 +25,16 @@ import com.sun.enterprise.security.util.IASSecurityException; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.logging.LogDomains; - import jakarta.security.jacc.PolicyConfiguration; import jakarta.security.jacc.PolicyConfigurationFactory; import jakarta.security.jacc.PolicyContextException; +import jakarta.security.jacc.PolicyFactory; +import java.util.Collection; +import java.util.logging.Logger; +import org.glassfish.api.deployment.DeploymentContext; +import org.glassfish.api.deployment.OpsParams; +import org.glassfish.deployment.common.SecurityRoleMapperFactory; +import org.glassfish.deployment.versioning.VersioningUtils; /** * This utility class encloses all the calls to a ejb method in a specified subject @@ -108,7 +105,7 @@ public static void removePolicy(String contextId) throws IASSecurityException { pc.delete(); // Only do refresh policy if the deleted context was in service if (wasInService) { - Policy.getPolicy().refresh(); + PolicyFactory.getPolicyFactory().getPolicy().refresh(); } } catch (ClassNotFoundException cnfe) { diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/cache/PermissionCache.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/cache/PermissionCache.java index d4468d9788a..e136df3a3b0 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/cache/PermissionCache.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authorize/cache/PermissionCache.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -20,15 +20,12 @@ import com.sun.enterprise.security.common.AppservAccessController; import com.sun.enterprise.security.ee.authorize.cache.CachedPermissionImpl.Epoch; import com.sun.logging.LogDomains; - import jakarta.security.jacc.PolicyContext; - import java.security.AllPermission; import java.security.CodeSource; import java.security.Permission; import java.security.PermissionCollection; import java.security.Permissions; -import java.security.Policy; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.Enumeration; diff --git a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityMechanismSelector.java b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityMechanismSelector.java index c73ab280fc4..7f45fcdb2cc 100644 --- a/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityMechanismSelector.java +++ b/appserver/security/ejb.security/src/main/java/com/sun/enterprise/iiop/security/SecurityMechanismSelector.java @@ -50,7 +50,6 @@ import com.sun.enterprise.security.common.ClientSecurityContext; import com.sun.enterprise.security.common.SecurityConstants; import com.sun.enterprise.security.ssl.SSLUtils; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.Utility; import com.sun.logging.LogDomains; diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipe.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipe.java index 2c8329d36da..142a8340b79 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipe.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipe.java @@ -40,8 +40,6 @@ import jakarta.security.auth.message.AuthStatus; import jakarta.security.auth.message.config.ServerAuthContext; import jakarta.xml.ws.WebServiceException; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; import java.util.Map; import java.util.logging.Logger; import javax.security.auth.Subject; diff --git a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipeCreator.java b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipeCreator.java index 1c1b3dfe63f..f807c4f97ae 100644 --- a/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipeCreator.java +++ b/appserver/security/webservices.security/src/main/java/com/sun/enterprise/security/webservices/server/ServerSecurityPipeCreator.java @@ -28,7 +28,6 @@ import static com.sun.xml.wss.provider.wsit.PipeConstants.SERVICE_ENDPOINT; import static com.sun.xml.wss.provider.wsit.PipeConstants.WSDL_MODEL; -import com.sun.enterprise.deployment.WebServiceEndpoint; import com.sun.xml.ws.api.model.SEIModel; import com.sun.xml.ws.api.model.wsdl.WSDLBoundOperation; import com.sun.xml.ws.api.model.wsdl.WSDLPort; diff --git a/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java index 8dcaff02049..782f7c428a0 100644 --- a/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java +++ b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java @@ -18,8 +18,6 @@ package com.sun.enterprise.tests.progress; import com.sun.enterprise.util.StringUtils; -import com.sun.logging.LogDomains; - import java.io.File; import java.io.IOException; import java.net.URI; diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/AsadminVersionITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/AsadminVersionITest.java index 62e0ed1b91e..2b5d1e87487 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/AsadminVersionITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/AsadminVersionITest.java @@ -16,8 +16,6 @@ package org.glassfish.main.admin.test; -import java.time.Instant; - import org.apache.commons.lang3.StringUtils; import org.glassfish.main.itest.tools.GlassFishTestEnvironment; import org.glassfish.main.itest.tools.asadmin.Asadmin; @@ -33,7 +31,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.matchesPattern; import static org.hamcrest.Matchers.stringContainsInOrder; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; /** * @author David Matejcek diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusComplexITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusComplexITest.java index 608a83c0a4b..75be23615ea 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusComplexITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusComplexITest.java @@ -29,7 +29,6 @@ import static org.glassfish.main.admin.test.progress.ProgressMessage.isIncreasing; import static org.glassfish.main.admin.test.progress.ProgressMessage.uniqueMessages; import static org.glassfish.main.itest.tools.asadmin.AsadminResultMatcher.asadminOK; -import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JdbcITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JdbcITest.java index b5040fde308..ea7f847093c 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JdbcITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JdbcITest.java @@ -26,7 +26,6 @@ import java.util.Map; import org.glassfish.main.itest.tools.RandomGenerator; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/appserver/tests/application/pom.xml b/appserver/tests/application/pom.xml index fa917bddabc..1c2439ab611 100755 --- a/appserver/tests/application/pom.xml +++ b/appserver/tests/application/pom.xml @@ -1,7 +1,7 @@ - - + - - - - - + diff --git a/appserver/tests/quicklook/gfproject/db-targets.xml b/appserver/tests/quicklook/gfproject/db-targets.xml index 5e3b1db9f4e..57cddf882b4 100644 --- a/appserver/tests/quicklook/gfproject/db-targets.xml +++ b/appserver/tests/quicklook/gfproject/db-targets.xml @@ -57,66 +57,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/appserver/tests/quicklook/pom.xml b/appserver/tests/quicklook/pom.xml index 33e633b8fd9..a7d3584335b 100644 --- a/appserver/tests/quicklook/pom.xml +++ b/appserver/tests/quicklook/pom.xml @@ -93,7 +93,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/appserver/tests/tck/authentication/pom.xml b/appserver/tests/tck/authentication/pom.xml index 866788f01d8..a48c1dd2c82 100644 --- a/appserver/tests/tck/authentication/pom.xml +++ b/appserver/tests/tck/authentication/pom.xml @@ -177,7 +177,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -308,7 +308,6 @@ - diff --git a/appserver/tests/tck/rest/pom.xml b/appserver/tests/tck/rest/pom.xml index 28f52df298c..2b9f4ce558b 100644 --- a/appserver/tests/tck/rest/pom.xml +++ b/appserver/tests/tck/rest/pom.xml @@ -38,7 +38,7 @@ mvn clean install -Drun.test="JAXRSBasicClientIT#basicAuthorizationAdminTest" Run single test and suspend on port 9009: -mvn clean install -Drun.test="JAXRSBasicClientIT#basicAuthorizationAdminTest" -Dglassfish.suspend +mvn clean install -Drun.test="JAXRSBasicClientIT#basicAuthorizationAdminTest" -Dglassfish.suspend Run a specified group: @@ -66,59 +66,57 @@ mvn clean install -Dgroups=security UTF-8 3.1.1 - + ${project.version} ${project.build.directory} ${glassfish.root}/glassfish8 - - - - - - org.junit - junit-bom - 5.9.1 - pom - import - - - - + - - jakarta.ws.rs jakarta-restful-ws-tck ${tck.version} test - - - + + org.omnifaces.arquillian arquillian-glassfish-server-managed - 1.2 + 1.4 - - + + org.jboss.arquillian.junit5 + arquillian-junit5-container + 1.8.0.Final + + + org.omnifaces.arquillian glassfish-client-ee10 - 1.2 + 1.4 - - + org.netbeans.tools sigtest-maven-plugin - 1.6 + 1.7 + + + + org.junit.jupiter + junit-jupiter-engine + + + org.hamcrest + hamcrest + + + commons-httpclient + commons-httpclient + 3.1 @@ -149,7 +147,7 @@ mvn clean install -Dgroups=security - + maven-failsafe-plugin @@ -164,37 +162,37 @@ mvn clean install -Dgroups=security **/SeBootstrapIT.java - + ${run.test} - + jakarta.ws.rs:jakarta-restful-ws-tck - + ${glassfish.root}/glassfish8 2048m - + create-file-user --groups staff:mgr:DIRECTOR --passwordfile ${project.build.directory}/test-classes/j2ee.pass j2ee create-file-user --groups guest:OTHERROLE --passwordfile ${project.build.directory}/test-classes/javajoe.pass javajoe set server-config.network-config.protocols.protocol.http-listener-1.http.trace-enabled=true - - j2ee j2ee javajoe javajoe - - + + localhost 8080 - - + + org.glassfish.jersey.servlet.ServletContainer ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL ${project.build.directory}/jdk-bundle @@ -218,7 +216,7 @@ mvn clean install -Dgroups=security glassfish - + web diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/XAResourceWrapper.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/XAResourceWrapper.java index f59bfef8b27..000993291c8 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/XAResourceWrapper.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/api/XAResourceWrapper.java @@ -16,7 +16,6 @@ package com.sun.enterprise.transaction.api; -import javax.sql.*; import javax.transaction.xa.*; import javax.security.auth.Subject; import jakarta.resource.spi.ManagedConnection; diff --git a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java index ff691c2e4b3..6016c103d3c 100644 --- a/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java +++ b/appserver/transaction/internal-api/src/main/java/com/sun/enterprise/transaction/config/TransactionService.java @@ -33,8 +33,6 @@ import org.glassfish.config.support.datatypes.PositiveInteger; import org.glassfish.api.admin.config.PropertyDesc; import org.glassfish.api.admin.config.PropertiesDesc; - -import jakarta.validation.constraints.Min; /** * Configuration for Transaction Manager */ diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/AdminUtil.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/AdminUtil.java index 576f444c20c..a3d62d7fcf5 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/AdminUtil.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/AdminUtil.java @@ -17,7 +17,6 @@ package com.sun.jts.CosTransactions; import java.util.*; -import org.omg.CosTransactions.*; /** * AdminUtil - Utility class for monitoring and administering jts. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/ControlImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/ControlImpl.java index 9e674483d64..bcd40833c35 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/ControlImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/ControlImpl.java @@ -32,8 +32,6 @@ // Import required classes. -import java.util.*; - import org.omg.CORBA.*; import org.omg.PortableServer.*; import org.omg.CosTransactions.*; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorImpl.java index 1bd9bfe7636..74b7367c8e6 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorImpl.java @@ -32,8 +32,6 @@ // Import required classes. -import java.util.*; - import org.omg.CORBA.*; import org.omg.PortableServer.*; import org.omg.CosTransactions.*; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorResourceImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorResourceImpl.java index c7f0f62767a..f7c7a73f427 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorResourceImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/CoordinatorResourceImpl.java @@ -40,7 +40,6 @@ import com.sun.jts.codegen.otsidl.*; -import com.sun.jts.trace.*; import java.util.logging.Logger; import java.util.logging.Level; import com.sun.logging.LogDomains; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java index 085b8b24aa0..00bcd1e17da 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DefaultTransactionService.java @@ -39,20 +39,15 @@ import org.omg.CORBA.*; import org.omg.CORBA.ORBPackage.InvalidName; import org.omg.CosTransactions.*; -import org.omg.CORBA.Policy.*; import org.omg.CosNaming.*; -import org.omg.CosNaming.NamingContextPackage.*; import org.omg.PortableServer.*; import org.omg.CORBA.LocalObject; import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; -import com.sun.jts.codegen.otsidl.*; - import java.util.logging.Logger; import java.util.logging.Level; import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; /**The DefaultTransactionService is our implemention of the * com.sun.CosTransactions.TransactionService class. diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java index c22f859e331..4a0316e494b 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/DelegatedTimeoutManager.java @@ -22,12 +22,9 @@ import org.omg.CosTransactions.*; import com.sun.jts.jtsxa.XID; -import com.sun.jts.trace.*; - import java.util.logging.Logger; import java.util.logging.Level; import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; /** * This class records state for timing out transactions, and runs a thread diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryCoordinatorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryCoordinatorImpl.java index e6da8015add..e43419d3145 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryCoordinatorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/RecoveryCoordinatorImpl.java @@ -33,7 +33,6 @@ import org.omg.CORBA.*; import org.omg.PortableServer.*; import org.omg.CosTransactions.*; -import com.sun.jts.trace.*; import java.util.logging.Logger; import java.util.logging.Level; import com.sun.logging.LogDomains; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SuperiorInfo.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SuperiorInfo.java index 9a030d757d9..1a245577b0e 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SuperiorInfo.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/SuperiorInfo.java @@ -30,11 +30,7 @@ package com.sun.jts.CosTransactions; -import java.io.*; - -import org.omg.CORBA.*; import org.omg.CosTransactions.*; -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; /** * The SuperiorInfo interface provides operations that record the local diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java index 49b9d68cb1a..0bed882b74e 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TopCoordinator.java @@ -46,8 +46,6 @@ //import com.sun.enterprise.transaction.OTSResourceImpl; //import com.sun.enterprise.transaction.SynchronizationImpl; -import com.sun.jts.trace.*; - import java.util.logging.Logger; import java.util.logging.Level; import com.sun.logging.LogDomains; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java index 0bc965f8ae7..4437498b34c 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/CosTransactions/TransactionFactoryImpl.java @@ -36,10 +36,6 @@ import org.omg.CosTransactions.*; import org.omg.CosNaming.*; -import org.omg.CosNaming.NamingContextPackage.*; - -import com.sun.jts.trace.*; - import java.util.logging.Logger; import java.util.logging.Level; import com.sun.logging.LogDomains; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java index b559a3c5d33..05ca593835c 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/OTSResourceImpl.java @@ -22,7 +22,6 @@ import com.sun.jts.CosTransactions.*; -import com.sun.jts.jta.*; import javax.transaction.xa.*; //import com.sun.jts.etsjdbc.odbc.NativeXAResourceImpl; import com.sun.jts.jta.TransactionState; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/Utility.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/Utility.java index 15e5eff542a..e4a726c527a 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/Utility.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/Utility.java @@ -16,9 +16,6 @@ package com.sun.jts.jtsxa; -import java.io.*; -import java.util.*; - import org.omg.CosTransactions.*; import com.sun.jts.codegen.otsidl.*; import com.sun.jts.CosTransactions.*; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/XID.java b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/XID.java index 91e66d7a8e0..eced0b02b67 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/XID.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/jtsxa/XID.java @@ -36,7 +36,6 @@ import java.util.logging.Logger; import java.util.logging.Level; import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; /** * The XID class provides an implementation of the X/Open diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java index 2fadb4d0f8f..34fb6a24fc3 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/pi/InterceptorImpl.java @@ -16,8 +16,6 @@ package com.sun.jts.pi; -import java.lang.reflect.Method; - import org.omg.IOP.Codec; import org.omg.IOP.ServiceContext; import org.omg.IOP.TaggedComponent; @@ -53,11 +51,6 @@ import com.sun.jts.CosTransactions.CurrentTransaction; import com.sun.corba.ee.impl.txpoa.TSIdentificationImpl; -import com.sun.corba.ee.spi.ior.IOR; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; -import com.sun.corba.ee.spi.ior.ObjectAdapterId; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfile; -import com.sun.corba.ee.spi.orb.ORBVersionFactory; import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager; import com.sun.corba.ee.spi.misc.ORBConstants; diff --git a/appserver/transaction/jts/src/main/java/com/sun/jts/utils/RecoveryHooks/FailureInducer.java b/appserver/transaction/jts/src/main/java/com/sun/jts/utils/RecoveryHooks/FailureInducer.java index 25c1d6b9002..c0fa8a670e9 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/jts/utils/RecoveryHooks/FailureInducer.java +++ b/appserver/transaction/jts/src/main/java/com/sun/jts/utils/RecoveryHooks/FailureInducer.java @@ -16,7 +16,6 @@ package com.sun.jts.utils.RecoveryHooks; -import java.text.MessageFormat; import java.util.Hashtable; import java.util.ResourceBundle; import com.sun.jts.jtsxa.Utility; @@ -30,7 +29,6 @@ import java.util.logging.Logger; import java.util.logging.Level; import com.sun.logging.LogDomains; -import com.sun.jts.utils.LogFormatter; /** * This class defines API's for the test harness to induce * recovery by setting crash points (in the case of TM crashes) diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java index f34a4158f93..0173f2b31a7 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/cli/CreateNetworkListener.java @@ -20,8 +20,6 @@ import java.text.MessageFormat; import java.util.List; import java.util.ResourceBundle; -import java.util.logging.Logger; - import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.VirtualServer; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java index 4e59b2e9fc6..9e299a2b2a3 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/HttpServiceStatsProvider.java @@ -34,7 +34,6 @@ import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.gmbal.ManagedObject; import org.glassfish.grizzly.config.dom.NetworkConfig; -import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.hk2.api.PostConstruct; import org.glassfish.web.admin.LogFacade; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java index b8deba35c96..7a7d1e79543 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/JspProbeProvider.java @@ -16,7 +16,6 @@ package org.glassfish.web.admin.monitor; -import jakarta.servlet.Servlet; import org.glassfish.external.probe.provider.annotations.Probe; import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.probe.provider.annotations.ProbeProvider; diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java index 86c105b3204..49bba740dd2 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/RequestProbeProvider.java @@ -17,7 +17,6 @@ package org.glassfish.web.admin.monitor; import org.glassfish.external.probe.provider.annotations.*; -import org.glassfish.grizzly.Buffer; /** * Provider interface for HTTP request/response related probes. diff --git a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java index 2a42fc8eb45..c2774cd7eee 100644 --- a/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java +++ b/appserver/web/admin/src/main/java/org/glassfish/web/admin/monitor/ServletProbeProvider.java @@ -16,7 +16,6 @@ package org.glassfish.web.admin.monitor; -import java.security.Principal; import org.glassfish.external.probe.provider.annotations.Probe; import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.external.probe.provider.annotations.ProbeProvider; diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionConfig.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionConfig.java index ea42848439d..606e8a50da3 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionConfig.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionConfig.java @@ -21,7 +21,6 @@ import org.jvnet.hk2.config.ConfigBeanProxy; import java.beans.PropertyVetoException; -import java.io.Serializable; import jakarta.validation.constraints.NotNull; diff --git a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionManager.java b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionManager.java index 1c0c54cea78..00eb4a397f7 100644 --- a/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionManager.java +++ b/appserver/web/gf-web-connector/src/main/java/org/glassfish/web/config/serverbeans/SessionManager.java @@ -21,7 +21,6 @@ import org.jvnet.hk2.config.ConfigBeanProxy; import java.beans.PropertyVetoException; -import java.io.Serializable; import jakarta.validation.constraints.NotNull; diff --git a/appserver/web/war-util/src/test/java/org/glassfish/web/loader/WebappClassLoaderTest.java b/appserver/web/war-util/src/test/java/org/glassfish/web/loader/WebappClassLoaderTest.java index 0e8a3b6a837..0ab3506dfe0 100644 --- a/appserver/web/war-util/src/test/java/org/glassfish/web/loader/WebappClassLoaderTest.java +++ b/appserver/web/war-util/src/test/java/org/glassfish/web/loader/WebappClassLoaderTest.java @@ -18,7 +18,6 @@ import com.sun.enterprise.util.io.FileUtils; -import java.io.IOException; import java.net.URL; import java.net.URLClassLoader; import java.nio.file.Files; @@ -26,16 +25,12 @@ import org.apache.naming.resources.WebDirContext; import org.glassfish.common.util.GlassfishUrlClassLoader; -import org.hamcrest.core.StringEndsWith; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.arrayWithSize; -import static org.hamcrest.Matchers.hasLength; -import static org.hamcrest.Matchers.stringContainsInOrder; import static org.hamcrest.core.StringEndsWith.endsWith; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/AsyncContextImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/AsyncContextImpl.java index 2b86d21eb6d..951d5d97a6b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/AsyncContextImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/AsyncContextImpl.java @@ -30,7 +30,6 @@ import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.security.AccessController; import java.security.PrivilegedAction; import java.util.EventListener; import java.util.LinkedList; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java index 9270efef623..102fdf9b7c3 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -34,7 +34,6 @@ import static org.glassfish.internal.api.Globals.getDefaultHabitat; import java.io.CharConversionException; -import java.io.IOException; import java.nio.charset.Charset; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; @@ -43,7 +42,6 @@ import java.util.ResourceBundle; import java.util.logging.Logger; -import jakarta.servlet.http.HttpServletResponse; import org.apache.catalina.Container; import org.apache.catalina.Context; import org.apache.catalina.Globals; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/InputBuffer.java b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/InputBuffer.java index 88e67b00f5f..ad053239ed3 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/connector/InputBuffer.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/connector/InputBuffer.java @@ -17,21 +17,17 @@ package org.apache.catalina.connector; +import jakarta.servlet.ReadListener; +import jakarta.servlet.http.WebConnection; import java.io.IOException; import java.io.Reader; import java.nio.channels.InterruptedByTimeoutException; -import java.security.PrivilegedAction; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; - -import jakarta.servlet.ReadListener; -import jakarta.servlet.http.WebConnection; - import org.apache.catalina.ContainerEvent; import org.apache.catalina.Context; import org.apache.catalina.LogFacade; -import org.apache.catalina.Globals; import org.glassfish.grizzly.ReadHandler; import org.glassfish.grizzly.http.server.Request; import org.glassfish.grizzly.http.util.ByteChunk.ByteInputChannel; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java index 3c382f454ed..6796bacc3f3 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationContextFacade.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * Copyright 2004 The Apache Software Foundation * @@ -31,14 +31,11 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.Enumeration; import java.util.EventListener; import java.util.Map; import java.util.Set; - /** * Facade object which masks the internal ApplicationContext * object from the web application. diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java index 1f3af30d222..d637f0324ed 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationDispatcher.java @@ -23,28 +23,39 @@ import static jakarta.servlet.DispatcherType.FORWARD; import static jakarta.servlet.DispatcherType.INCLUDE; import static java.util.logging.Level.FINE; +import static org.apache.catalina.InstanceEvent.EventType.AFTER_DISPATCH_EVENT; -import org.apache.catalina.*; -import org.apache.catalina.connector.ClientAbortException; -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.RequestFacade; -import org.apache.catalina.connector.ResponseFacade; -import org.apache.catalina.util.InstanceSupport; - -import jakarta.servlet.*; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletRequestWrapper; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.ServletResponseWrapper; +import jakarta.servlet.UnavailableException; +import jakarta.servlet.http.HttpServletMapping; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import java.text.MessageFormat; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; -import java.text.MessageFormat; -import jakarta.servlet.http.HttpServletMapping; - -import static org.apache.catalina.InstanceEvent.EventType.AFTER_DISPATCH_EVENT; +import org.apache.catalina.Context; +import org.apache.catalina.Globals; +import org.apache.catalina.HttpResponse; +import org.apache.catalina.InstanceEvent; +import org.apache.catalina.LogFacade; +import org.apache.catalina.Wrapper; +import org.apache.catalina.connector.ClientAbortException; import org.apache.catalina.connector.MappingImpl; +import org.apache.catalina.connector.Request; +import org.apache.catalina.connector.RequestFacade; +import org.apache.catalina.connector.ResponseFacade; +import org.apache.catalina.util.InstanceSupport; import org.glassfish.grizzly.http.server.util.Mapper; import org.glassfish.grizzly.http.server.util.MappingData; import org.glassfish.grizzly.http.util.CharChunk; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java index cf159e20ce5..418abfd595c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationHttpRequest.java @@ -36,8 +36,6 @@ import java.io.IOException; import java.util.*; import jakarta.servlet.http.HttpServletMapping; -import org.apache.catalina.connector.MappingImpl; -// END GlassFish 896 /** * Wrapper around a jakarta.servlet.http.HttpServletRequest diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationPushBuilder.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationPushBuilder.java index b8c6d96c35a..0201f6f6155 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationPushBuilder.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ApplicationPushBuilder.java @@ -39,7 +39,6 @@ import org.apache.catalina.connector.Request; import org.glassfish.grizzly.http.Cookie; -import org.glassfish.grizzly.http.Method; import org.glassfish.grizzly.http.server.http2.PushEvent; import org.glassfish.grizzly.http2.Http2Stream; import org.glassfish.grizzly.http.util.Header; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicFilterRegistrationImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicFilterRegistrationImpl.java index 6f0c32ba96c..8c179f139de 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicFilterRegistrationImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicFilterRegistrationImpl.java @@ -22,7 +22,6 @@ import jakarta.servlet.FilterRegistration; import java.text.MessageFormat; import java.util.ResourceBundle; -import java.util.logging.Logger; public class DynamicFilterRegistrationImpl diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicServletRegistrationImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicServletRegistrationImpl.java index 981c3abcf62..959c6f85a4c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicServletRegistrationImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/DynamicServletRegistrationImpl.java @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.Set; import java.util.ResourceBundle; -import java.util.logging.Logger; import java.text.MessageFormat; import org.apache.catalina.LogFacade; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/FilterRegistrationImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/FilterRegistrationImpl.java index 30d6ff0c2d5..f3941ed0ad5 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/FilterRegistrationImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/FilterRegistrationImpl.java @@ -28,7 +28,6 @@ import java.util.Set; import java.text.MessageFormat; import java.util.*; -import java.util.logging.Logger; public class FilterRegistrationImpl implements FilterRegistration { diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/RequestFacadeHelper.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/RequestFacadeHelper.java index f164c03bbd5..9e52a9f170d 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/RequestFacadeHelper.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/RequestFacadeHelper.java @@ -24,7 +24,6 @@ import org.apache.catalina.connector.SessionTracker; import java.util.ResourceBundle; -import java.util.logging.Logger; import jakarta.servlet.ServletRequest; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ServletRegistrationImpl.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ServletRegistrationImpl.java index 65fbc7b52cd..8d4437fb3f3 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/ServletRegistrationImpl.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/ServletRegistrationImpl.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Set; import java.util.ResourceBundle; -import java.util.logging.Logger; - import org.apache.catalina.LogFacade; public class ServletRegistrationImpl implements ServletRegistration { diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContextValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContextValve.java index 1c5804404db..bbd925fa5ed 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContextValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardContextValve.java @@ -26,8 +26,6 @@ import jakarta.servlet.*; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import org.glassfish.grizzly.http.util.DataChunk; -// END GlassFish 1343 /** * Valve that implements the default basic behavior for the diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngineValve.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngineValve.java index 4c05731e2c5..4781207e95e 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngineValve.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardEngineValve.java @@ -29,7 +29,6 @@ import java.io.IOException; import java.text.MessageFormat; import java.util.ResourceBundle; -import java.util.logging.Logger; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardService.java b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardService.java index 48c461f818d..2d91d52cfbb 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardService.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/core/StandardService.java @@ -27,7 +27,6 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.text.MessageFormat; import java.util.List; import java.util.ResourceBundle; import java.util.logging.Logger; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextEnvironment.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextEnvironment.java index b27af100379..21b7aa75b57 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextEnvironment.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextEnvironment.java @@ -17,8 +17,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; - /** * Representation of an application environment entry, as represented in diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextLocalEjb.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextLocalEjb.java index 8153f11dc7c..23eb7cdd4b0 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextLocalEjb.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextLocalEjb.java @@ -17,8 +17,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; - /** * Representation of a local EJB resource reference for a web application, as diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextResource.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextResource.java index fa4fb41477b..636d64cd0d4 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextResource.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextResource.java @@ -17,8 +17,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; - /** * Representation of a resource reference for a web application, as diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextResourceLink.java b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextResourceLink.java index 1799efe16b7..76034500716 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextResourceLink.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/deploy/ContextResourceLink.java @@ -17,8 +17,6 @@ package org.apache.catalina.deploy; -import java.io.Serializable; - /** * Representation of a resource link for a web application, as diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/MultipartStream.java b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/MultipartStream.java index 616de572ba2..5fe02f41919 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/MultipartStream.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/MultipartStream.java @@ -23,7 +23,6 @@ import java.io.ByteArrayOutputStream; import java.io.*; -import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/RequestItemIterator.java b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/RequestItemIterator.java index 64bd195a855..75975588960 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/RequestItemIterator.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/RequestItemIterator.java @@ -20,8 +20,6 @@ package org.apache.catalina.fileupload; -import org.apache.catalina.Globals; - import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/security/SecurityUtil.java b/appserver/web/web-core/src/main/java/org/apache/catalina/security/SecurityUtil.java index d105e76e0b6..4128a82367c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/security/SecurityUtil.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/security/SecurityUtil.java @@ -24,22 +24,16 @@ import jakarta.servlet.UnavailableException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpSession; - import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.security.AccessController; import java.security.Principal; -import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -import java.security.Security; import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; - import javax.security.auth.Subject; - import org.apache.catalina.Globals; import org.apache.catalina.LogFacade; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/DefaultServlet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/DefaultServlet.java index f38e8b6df44..f5685f4c694 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/DefaultServlet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/DefaultServlet.java @@ -47,7 +47,6 @@ import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; -import java.security.AccessController; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; @@ -80,8 +79,6 @@ import org.apache.naming.resources.ProxyDirContext; import org.apache.naming.resources.Resource; import org.apache.naming.resources.ResourceAttributes; -import org.apache.tomcat.util.security.PrivilegedGetTccl; -import org.apache.tomcat.util.security.PrivilegedSetTccl; import org.glassfish.grizzly.http.server.util.AlternateDocBase; import org.glassfish.web.util.HtmlEntityEncoder; import org.w3c.dom.Document; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerHttpRequest.java b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerHttpRequest.java index 296a7d3e8e1..c927dffb6d6 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerHttpRequest.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerHttpRequest.java @@ -18,8 +18,6 @@ package org.apache.catalina.servlets; -import org.apache.catalina.util.StringManager; - import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequestWrapper; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerServlet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerServlet.java index 99ab80f31db..0a931998020 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerServlet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/InvokerServlet.java @@ -23,8 +23,6 @@ import org.apache.catalina.Globals; import org.apache.catalina.LogFacade; import org.apache.catalina.Wrapper; -import org.apache.catalina.util.StringManager; - import jakarta.servlet.RequestDispatcher; import jakarta.servlet.Servlet; import jakarta.servlet.ServletException; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/WebdavServlet.java b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/WebdavServlet.java index 88acbafdaa7..5d2a72a43dc 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/WebdavServlet.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/servlets/WebdavServlet.java @@ -40,7 +40,6 @@ import jakarta.servlet.RequestDispatcher; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; -import jakarta.servlet.UnavailableException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import javax.xml.XMLConstants; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/CookiePersistentManager.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/CookiePersistentManager.java index f6bd3ee01ef..950713ceade 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/CookiePersistentManager.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/CookiePersistentManager.java @@ -18,8 +18,6 @@ import org.apache.catalina.LogFacade; import org.apache.catalina.Session; -import org.apache.catalina.core.StandardContext; - import java.io.*; import java.text.MessageFormat; import java.util.*; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java index 28fc735c207..d647f9d31f3 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/ManagerBase.java @@ -50,7 +50,6 @@ import javax.management.ObjectName; import org.apache.catalina.Container; import org.apache.catalina.Engine; -import org.apache.catalina.Globals; import org.apache.catalina.LogFacade; import org.apache.catalina.Manager; import org.apache.catalina.Session; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java index f22d3a92cf2..43f9f2a5b3c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/ssi/SSIServletExternalResolver.java @@ -35,7 +35,6 @@ import java.util.Date; import java.util.Enumeration; import java.util.Locale; -import org.glassfish.grizzly.http.util.Constants; import org.glassfish.grizzly.utils.Charsets; /** diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Catalina.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Catalina.java index a78d4107a38..be15a24db5f 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Catalina.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/Catalina.java @@ -32,7 +32,6 @@ import java.net.Socket; import java.text.MessageFormat; import java.util.logging.Level; -import java.util.logging.Logger; /** * Startup/Shutdown shell program for Catalina. The following command line diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java index 458b63260c1..d6e44ca1fbb 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/DigesterFactory.java @@ -17,7 +17,6 @@ package org.apache.catalina.startup; -import com.sun.logging.LogDomains; import org.apache.catalina.LogFacade; import org.apache.tomcat.util.digester.Digester; import org.apache.tomcat.util.digester.RuleSet; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/UserConfig.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/UserConfig.java index eb27cb533df..b8377196d62 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/UserConfig.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/UserConfig.java @@ -20,9 +20,6 @@ import org.apache.catalina.*; import org.apache.catalina.Logger; import org.apache.catalina.core.StandardContext; -import org.apache.catalina.util.StringManager; -import org.apache.tomcat.util.digester.ObjectParamRule; - import java.io.File; import java.text.MessageFormat; import java.util.Enumeration; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/LifecycleSupport.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/LifecycleSupport.java index 64b18de959f..74b5214495e 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/LifecycleSupport.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/LifecycleSupport.java @@ -23,7 +23,6 @@ import org.apache.catalina.LifecycleListener; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/util/RequestUtil.java b/appserver/web/web-core/src/main/java/org/apache/catalina/util/RequestUtil.java index 540245296b7..5befea99b0b 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/util/RequestUtil.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/util/RequestUtil.java @@ -22,7 +22,6 @@ import java.nio.charset.UnsupportedCharsetException; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.StringTokenizer; import jakarta.servlet.http.Cookie; diff --git a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/SslConfig.java b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/SslConfig.java index 6802345b0d3..d99c420966b 100644 --- a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/SslConfig.java +++ b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/SslConfig.java @@ -16,7 +16,6 @@ package org.glassfish.embeddable.web.config; -import java.io.File; import java.util.Set; /** diff --git a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/WebListenerConfig.java b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/WebListenerConfig.java index cabe75a98d0..8c99f5c36ba 100644 --- a/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/WebListenerConfig.java +++ b/appserver/web/web-embed/api/src/main/java/org/glassfish/embeddable/web/config/WebListenerConfig.java @@ -16,8 +16,6 @@ package org.glassfish.embeddable.web.config; -import org.glassfish.embeddable.web.WebListener; - /** * Class that is used for configuring WebListener instances. * diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PESessionLocker.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PESessionLocker.java index bdf141f00c1..04e6aeecac9 100755 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PESessionLocker.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/PESessionLocker.java @@ -25,7 +25,6 @@ import org.apache.catalina.Context; import org.apache.catalina.Manager; import org.apache.catalina.Session; -import org.apache.catalina.SessionLocker; import org.apache.catalina.session.BaseSessionLocker; import org.apache.catalina.session.StandardSession; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerFacade.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerFacade.java index bf3e1cd29f0..807b7c4b72f 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerFacade.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/VirtualServerFacade.java @@ -18,25 +18,12 @@ import java.io.*; -import java.net.*; import java.util.*; -import java.util.logging.Level; -import java.util.logging.Logger; -import jakarta.servlet.*; -import jakarta.servlet.descriptor.JspConfigDescriptor; - -import com.sun.enterprise.config.serverbeans.Applications; -import org.apache.catalina.core.*; -import org.apache.catalina.deploy.FilterDef; -import org.apache.catalina.deploy.FilterMap; -import org.glassfish.embeddable.Deployer; import org.glassfish.embeddable.GlassFishException; import org.glassfish.embeddable.web.ConfigException; import org.glassfish.embeddable.web.Context; import org.glassfish.embeddable.web.WebListener; -import org.glassfish.embeddable.web.config.SecurityConfig; import org.glassfish.embeddable.web.config.VirtualServerConfig; -import org.glassfish.internal.api.Globals; /** * Facade object which masks the internal VirtualServer diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleConfig.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleConfig.java index 6d80c872a54..f68b063bacf 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleConfig.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleConfig.java @@ -17,7 +17,6 @@ package com.sun.enterprise.web; import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.deployment.WebBundleDescriptor; import com.sun.enterprise.util.io.FileUtils; import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.web.deployment.descriptor.WebBundleDescriptorImpl; diff --git a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/session/SessionCookieConfig.java b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/session/SessionCookieConfig.java index e27858e3965..ee9566def9f 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/session/SessionCookieConfig.java +++ b/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/session/SessionCookieConfig.java @@ -16,8 +16,6 @@ package com.sun.enterprise.web.session; -import org.apache.catalina.Globals; - import java.net.URLEncoder; /** diff --git a/appserver/web/web-glue/src/main/java/com/sun/web/server/EEInstanceListener.java b/appserver/web/web-glue/src/main/java/com/sun/web/server/EEInstanceListener.java index 3f0d72d4a89..99880756b2d 100644 --- a/appserver/web/web-glue/src/main/java/com/sun/web/server/EEInstanceListener.java +++ b/appserver/web/web-glue/src/main/java/com/sun/web/server/EEInstanceListener.java @@ -19,7 +19,6 @@ import static com.sun.enterprise.security.integration.SecurityConstants.WEB_PRINCIPAL_CLASS; import static com.sun.enterprise.util.Utility.isOneOf; -import static java.security.Policy.getPolicy; import static java.text.MessageFormat.format; import static java.util.logging.Level.FINE; import static java.util.logging.Level.SEVERE; @@ -34,16 +33,23 @@ import static org.glassfish.web.LogFacade.SECURITY_CONTEXT_FAILED; import static org.glassfish.web.LogFacade.SECURITY_CONTEXT_OBTAINED; -import java.security.AccessControlException; -import java.security.AccessController; +import com.sun.enterprise.container.common.spi.util.InjectionException; +import com.sun.enterprise.container.common.spi.util.InjectionManager; +import com.sun.enterprise.security.integration.AppServSecurityContext; +import com.sun.enterprise.security.integration.RealmInitializer; +import com.sun.enterprise.transaction.api.JavaEETransactionManager; +import com.sun.enterprise.web.WebComponentInvocation; +import com.sun.enterprise.web.WebModule; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletRequestWrapper; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.security.Principal; -import java.security.PrivilegedAction; import java.util.ResourceBundle; import java.util.logging.Level; import java.util.logging.Logger; - -import javax.security.auth.AuthPermission; - import org.apache.catalina.Context; import org.apache.catalina.InstanceEvent; import org.apache.catalina.InstanceListener; @@ -59,21 +65,6 @@ import org.glassfish.wasp.servlet.JspServlet; import org.glassfish.web.LogFacade; -import com.sun.enterprise.container.common.spi.util.InjectionException; -import com.sun.enterprise.container.common.spi.util.InjectionManager; -import com.sun.enterprise.security.integration.AppServSecurityContext; -import com.sun.enterprise.security.integration.RealmInitializer; -import com.sun.enterprise.transaction.api.JavaEETransactionManager; -import com.sun.enterprise.web.WebComponentInvocation; -import com.sun.enterprise.web.WebModule; - -import jakarta.servlet.Servlet; -import jakarta.servlet.ServletRequest; -import jakarta.servlet.ServletRequestWrapper; -import jakarta.servlet.ServletResponse; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - /** * This class implements the Tomcat InstanceListener interface and handles the INIT,DESTROY and SERVICE, FILTER events. * @@ -85,8 +76,6 @@ public final class EEInstanceListener implements InstanceListener { private static final Logger _logger = LogFacade.getLogger(); private static final ResourceBundle _rb = _logger.getResourceBundle(); - private static AuthPermission doAsPrivilegedPerm = new AuthPermission("doAsPrivileged"); - private InvocationManager invocationManager; private JavaEETransactionManager eeTransactionManager; private InjectionManager injectionManager; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/MultipartConfigHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/MultipartConfigHandler.java index 8ce55f20b60..13e0fdf0607 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/MultipartConfigHandler.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/MultipartConfigHandler.java @@ -24,7 +24,6 @@ import org.jvnet.hk2.annotations.Service; import jakarta.servlet.annotation.MultipartConfig; -import jakarta.servlet.annotation.WebServlet; import java.lang.annotation.Annotation; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebListenerHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebListenerHandler.java index 7a77b923ca5..c85b6a8646d 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebListenerHandler.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebListenerHandler.java @@ -36,7 +36,6 @@ import jakarta.servlet.http.HttpSessionAttributeListener; import jakarta.servlet.http.HttpSessionIdListener; import jakarta.servlet.http.HttpSessionListener; -import java.lang.annotation.Annotation; import java.util.logging.Level; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java index 57f8d7af262..bb8ad04ae62 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/annotation/handlers/WebServletHandler.java @@ -30,9 +30,7 @@ import jakarta.servlet.annotation.WebInitParam; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; -import java.lang.annotation.Annotation; import java.util.Arrays; -import java.util.Set; import java.util.logging.Level; /** diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingNode.java index 76725d064b9..c98426b737b 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingNode.java @@ -17,7 +17,6 @@ package org.glassfish.web.deployment.node; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; -import com.sun.enterprise.deployment.node.DescriptorFactory; import com.sun.enterprise.deployment.node.XMLElement; import org.glassfish.web.deployment.descriptor.OrderingDescriptor; import org.glassfish.web.deployment.xml.WebTagNames; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingOrderingNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingOrderingNode.java index 6d768c418f2..6e6bca752ed 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingOrderingNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/OrderingOrderingNode.java @@ -19,7 +19,6 @@ import java.util.Map; import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; -import com.sun.enterprise.deployment.node.DescriptorFactory; import com.sun.enterprise.deployment.node.XMLElement; import org.glassfish.web.deployment.descriptor.OrderingOrderingDescriptor; import org.glassfish.web.deployment.xml.WebTagNames; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebResourceCollectionNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebResourceCollectionNode.java index b90530ed98f..91dd8ef2e00 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebResourceCollectionNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/WebResourceCollectionNode.java @@ -20,7 +20,6 @@ import com.sun.enterprise.deployment.node.DeploymentDescriptorNode; import com.sun.enterprise.deployment.node.XMLElement; import com.sun.enterprise.deployment.util.DOLUtils; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.net.URLPattern; import org.glassfish.web.deployment.descriptor.WebResourceCollectionImpl; import org.glassfish.web.deployment.xml.WebTagNames; diff --git a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CookiePropertiesNode.java b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CookiePropertiesNode.java index dcf09ce0857..21df2d3f917 100644 --- a/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CookiePropertiesNode.java +++ b/appserver/web/web-glue/src/main/java/org/glassfish/web/deployment/node/runtime/gf/CookiePropertiesNode.java @@ -16,7 +16,6 @@ package org.glassfish.web.deployment.node.runtime.gf; -import com.sun.enterprise.deployment.node.runtime.RuntimeDescriptorNode; import org.glassfish.web.deployment.runtime.CookieProperties; /** diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/CompositeMetadata.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/CompositeMetadata.java index becd7f76087..7a214500fad 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/CompositeMetadata.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/CompositeMetadata.java @@ -18,8 +18,6 @@ import org.glassfish.ha.store.api.Storeable; -import org.glassfish.ha.store.spi.StorableMap; - import java.io.*; import java.nio.charset.Charset; import java.util.*; diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/FullHASession.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/FullHASession.java index c7d5827db41..335df09fc67 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/FullHASession.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/FullHASession.java @@ -22,8 +22,6 @@ package org.glassfish.web.ha.session.management; -import java.io.Serializable; - import org.apache.catalina.Manager; /** diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HAStoreBase.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HAStoreBase.java index 8591c34195e..67564cde478 100644 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HAStoreBase.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/HAStoreBase.java @@ -33,8 +33,6 @@ import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; import org.apache.catalina.*; import org.apache.catalina.session.StoreBase; -import com.sun.enterprise.web.ServerConfigLookup; - import org.glassfish.web.ha.LogFacade; /** diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationAttributeStore.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationAttributeStore.java index f15bbd3d6b8..696999d0f7d 100755 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationAttributeStore.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationAttributeStore.java @@ -18,7 +18,6 @@ package org.glassfish.web.ha.session.management; import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; -import com.sun.enterprise.web.ServerConfigLookup; import org.glassfish.ha.store.api.BackingStore; import org.glassfish.ha.store.api.BackingStoreException; import org.apache.catalina.*; diff --git a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationStore.java b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationStore.java index 4043219a266..7cfbb1094aa 100755 --- a/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationStore.java +++ b/appserver/web/web-ha/src/main/java/org/glassfish/web/ha/session/management/ReplicationStore.java @@ -25,7 +25,6 @@ import com.sun.appserv.util.cache.BaseCache; import com.sun.enterprise.container.common.spi.util.JavaEEIOUtils; -import com.sun.enterprise.web.ServerConfigLookup; import org.apache.catalina.Container; import org.apache.catalina.Session; import org.apache.catalina.LifecycleException; diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/ContextAccessController.java b/appserver/web/web-naming/src/main/java/org/apache/naming/ContextAccessController.java index cc7376400b2..df1e9f4068d 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/ContextAccessController.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/ContextAccessController.java @@ -18,7 +18,6 @@ package org.apache.naming; import java.util.Hashtable; -import javax.naming.NamingException; /** * Handles the access control on the JNDI contexts. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/EjbRef.java b/appserver/web/web-naming/src/main/java/org/apache/naming/EjbRef.java index a5503a7aadf..229630db014 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/EjbRef.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/EjbRef.java @@ -17,7 +17,6 @@ package org.apache.naming; -import java.util.Hashtable; import javax.naming.Reference; import javax.naming.Context; import javax.naming.StringRefAddr; diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/JndiPermission.java b/appserver/web/web-naming/src/main/java/org/apache/naming/JndiPermission.java index ffce1a9e01e..8b0cd5f2e22 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/JndiPermission.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/JndiPermission.java @@ -18,7 +18,6 @@ package org.apache.naming; import java.security.BasicPermission; -import java.security.Permission; /** * Java SecurityManager Permission class for JNDI name based file resources diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceEnvRef.java b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceEnvRef.java index 7effa51dfde..8f15c84b393 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceEnvRef.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceEnvRef.java @@ -17,10 +17,8 @@ package org.apache.naming; -import java.util.Hashtable; import javax.naming.Reference; import javax.naming.Context; -import javax.naming.StringRefAddr; /** * Represents a reference address to a resource environment. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceLinkRef.java b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceLinkRef.java index 9dfb22095fc..c58562804a8 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceLinkRef.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/ResourceLinkRef.java @@ -17,7 +17,6 @@ package org.apache.naming; -import java.util.Hashtable; import javax.naming.Reference; import javax.naming.Context; import javax.naming.StringRefAddr; diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceLinkFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceLinkFactory.java index cadf7d9fd40..f12a837ec03 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceLinkFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/ResourceLinkFactory.java @@ -18,8 +18,6 @@ package org.apache.naming.factory; import java.util.Hashtable; -import java.sql.Driver; -import java.sql.DriverManager; import javax.naming.Name; import javax.naming.Context; import javax.naming.NamingException; diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/SendMailFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/SendMailFactory.java index cfacc02e928..f45864eca17 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/SendMailFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/SendMailFactory.java @@ -25,7 +25,6 @@ import jakarta.mail.Session; import jakarta.mail.internet.InternetAddress; import jakarta.mail.internet.MimeMessage; -import jakarta.mail.internet.MimePart; import jakarta.mail.internet.MimePartDataSource; import javax.naming.Name; import javax.naming.Context; diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java index 625a05d8855..de14b6391fa 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/BaseDirContext.java @@ -27,10 +27,8 @@ import javax.naming.NameParser; import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.CompositeName; import javax.naming.directory.DirContext; import javax.naming.directory.Attributes; -import javax.naming.directory.Attribute; import javax.naming.directory.ModificationItem; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandler.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandler.java index defecb7d0e8..7ad19e2e88f 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandler.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandler.java @@ -22,7 +22,6 @@ import java.net.URLStreamHandler; import java.io.IOException; import java.util.Hashtable; -import javax.naming.NamingException; import javax.naming.directory.DirContext; /** diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java index 186b39f7921..9e58bc977dc 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/DirContextURLStreamHandlerFactory.java @@ -19,9 +19,6 @@ import java.net.URLStreamHandler; import java.net.URLStreamHandlerFactory; -import java.io.IOException; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; /** * Factory for Stream handlers to a JNDI directory context. diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/jndi/Handler.java b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/jndi/Handler.java index 4a098f2a5e2..ac36357fa73 100644 --- a/appserver/web/web-naming/src/main/java/org/apache/naming/resources/jndi/Handler.java +++ b/appserver/web/web-naming/src/main/java/org/apache/naming/resources/jndi/Handler.java @@ -17,14 +17,6 @@ package org.apache.naming.resources.jndi; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLStreamHandler; -import java.io.IOException; -import java.util.Hashtable; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; - import org.apache.naming.resources.DirContextURLStreamHandler; /** diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java index 138ffb3cb10..7df598df9f5 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java @@ -17,17 +17,38 @@ package org.glassfish.weld; +import static com.sun.enterprise.util.Utility.isAnyEmpty; +import static com.sun.enterprise.util.Utility.isAnyNull; +import static com.sun.enterprise.util.Utility.isEmpty; +import static java.util.Collections.emptyList; +import static java.util.logging.Level.FINE; +import static java.util.stream.Collectors.toList; +import static org.glassfish.cdi.CDILoggerInfo.CREATING_DEPLOYMENT_ARCHIVE; +import static org.glassfish.cdi.CDILoggerInfo.EXCEPTION_SCANNING_JARS; +import static org.glassfish.cdi.CDILoggerInfo.GET_BEAN_DEPLOYMENT_ARCHIVES; +import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE; +import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_ADD_NEW_BDA_TO_ROOTS; +import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_ADD_TO_EXISTING; +import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_CHECKING; +import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_CHECKING_SUBBDA; +import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_CREATE_NEW_BDA; +import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_RETURNING_NEWLY_CREATED_BDA; +import static org.glassfish.deployment.common.InstalledLibrariesResolver.getInstalledLibraries; +import static org.glassfish.weld.WeldDeployer.WELD_BOOTSTRAP; +import static org.glassfish.weld.connector.WeldUtils.JAR_SUFFIX; +import static org.glassfish.weld.connector.WeldUtils.META_INF_BEANS_XML; +import static org.glassfish.weld.connector.WeldUtils.SEPARATOR_CHAR; +import static org.glassfish.weld.connector.WeldUtils.isImplicitBeanArchive; +import static org.jboss.weld.bootstrap.spi.BeanDiscoveryMode.NONE; + import com.sun.enterprise.deploy.shared.ArchiveFactory; import com.sun.enterprise.deployment.EjbDescriptor; - import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension; import jakarta.enterprise.inject.build.compatible.spi.SkipIfPortableExtensionPresent; import jakarta.enterprise.inject.spi.Extension; - import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; @@ -42,7 +63,6 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; - import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.cdi.CDILoggerInfo; @@ -59,30 +79,6 @@ import org.jboss.weld.bootstrap.spi.helpers.MetadataImpl; import org.jboss.weld.lite.extension.translator.LiteExtensionTranslator; -import static com.sun.enterprise.util.Utility.isAnyEmpty; -import static com.sun.enterprise.util.Utility.isAnyNull; -import static com.sun.enterprise.util.Utility.isEmpty; -import static java.util.Collections.emptyList; -import static java.util.logging.Level.FINE; -import static java.util.stream.Collectors.toList; -import static org.glassfish.cdi.CDILoggerInfo.CREATING_DEPLOYMENT_ARCHIVE; -import static org.glassfish.cdi.CDILoggerInfo.EXCEPTION_SCANNING_JARS; -import static org.glassfish.cdi.CDILoggerInfo.GET_BEAN_DEPLOYMENT_ARCHIVES; -import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE; -import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_ADD_NEW_BDA_TO_ROOTS; -import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_ADD_TO_EXISTING; -import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_CHECKING; -import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_CHECKING_SUBBDA; -import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_CREATE_NEW_BDA; -import static org.glassfish.cdi.CDILoggerInfo.LOAD_BEAN_DEPLOYMENT_ARCHIVE_RETURNING_NEWLY_CREATED_BDA; -import static org.glassfish.deployment.common.InstalledLibrariesResolver.getInstalledLibraries; -import static org.glassfish.weld.WeldDeployer.WELD_BOOTSTRAP; -import static org.glassfish.weld.connector.WeldUtils.JAR_SUFFIX; -import static org.glassfish.weld.connector.WeldUtils.META_INF_BEANS_XML; -import static org.glassfish.weld.connector.WeldUtils.SEPARATOR_CHAR; -import static org.glassfish.weld.connector.WeldUtils.isImplicitBeanArchive; -import static org.jboss.weld.bootstrap.spi.BeanDiscoveryMode.NONE; - /** * Represents a deployment of a CDI (Weld) application. */ diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldActivator.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldActivator.java index 18f672e71d7..2292432c67e 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldActivator.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldActivator.java @@ -18,7 +18,6 @@ package org.glassfish.weld; import org.jboss.weld.bootstrap.api.SingletonProvider; -import org.jboss.weld.bootstrap.api.helpers.TCCLSingletonProvider; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIServiceImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIServiceImpl.java index 4ca1872538b..9946addb79d 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIServiceImpl.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/CDIServiceImpl.java @@ -72,7 +72,6 @@ import org.jboss.weld.bootstrap.WeldBootstrap; import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive; import org.jboss.weld.contexts.WeldCreationalContext; -import org.jboss.weld.manager.BeanManagerImpl; import org.jboss.weld.manager.api.WeldInjectionTarget; import org.jboss.weld.manager.api.WeldManager; import org.jvnet.hk2.annotations.Service; diff --git a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/HandlerChainHandler.java b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/HandlerChainHandler.java index f4269de6e3c..dbcec7b121d 100644 --- a/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/HandlerChainHandler.java +++ b/appserver/webservices/connector/src/main/java/org/glassfish/webservices/connector/annotation/handlers/HandlerChainHandler.java @@ -23,7 +23,6 @@ import com.sun.enterprise.deployment.WebServiceEndpoint; import com.sun.enterprise.deployment.WebServiceHandler; import com.sun.enterprise.deployment.WebServiceHandlerChain; -import com.sun.enterprise.deployment.WritableJndiNameEnvironment; import com.sun.enterprise.deployment.annotation.context.HandlerContext; import com.sun.enterprise.deployment.annotation.context.ResourceContainerContextImpl; import com.sun.enterprise.deployment.annotation.handlers.AbstractHandler; diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSAdapterRegistry.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSAdapterRegistry.java index 7ba49ce26d7..be73946a2c4 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSAdapterRegistry.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSAdapterRegistry.java @@ -21,7 +21,6 @@ import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -import java.text.MessageFormat; /** * Registry of JAXWS Adapter of endpoints. diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java index b5302eebe17..bffc364ed57 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/JAXWSServiceDelegate.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.HashMap; import java.util.Iterator; -import java.util.List; import java.util.concurrent.Executor; import java.lang.reflect.Method; diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SOAPMessageContextImpl.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SOAPMessageContextImpl.java index 7bc46a643bd..8c53496eb17 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SOAPMessageContextImpl.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/SOAPMessageContextImpl.java @@ -18,15 +18,12 @@ import java.util.Set; import java.util.Map; -import java.util.Map.Entry; import java.util.Collection; import java.util.logging.Level; import java.util.logging.Logger; import javax.xml.namespace.QName; import jakarta.xml.bind.JAXBContext; -import jakarta.xml.ws.handler.MessageContext.Scope; - import com.sun.xml.ws.api.message.Messages; import com.sun.xml.ws.api.message.Message; import com.sun.xml.ws.api.message.Packet; diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java index a4eaffa3176..38f952c716a 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/WebServicesContract.java @@ -16,10 +16,7 @@ package org.glassfish.webservices; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Contract; -import org.glassfish.hk2.api.PostConstruct; import com.sun.enterprise.container.common.spi.util.ComponentEnvManager; import java.util.logging.Logger; diff --git a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java index def88c0da65..93a804629e9 100644 --- a/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java +++ b/appserver/webservices/jsr109-impl/src/main/java/org/glassfish/webservices/monitoring/WebServiceTesterServlet.java @@ -31,7 +31,6 @@ import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; -import java.net.URLClassLoader; import java.net.URLDecoder; import java.util.ArrayList; import java.util.Arrays; diff --git a/docs/parent/pom.xml b/docs/parent/pom.xml index 54357ea35c2..f3fe95a7895 100644 --- a/docs/parent/pom.xml +++ b/docs/parent/pom.xml @@ -1,6 +1,7 @@ DRAFT Eclipse GlassFish diff --git a/docs/pom.xml b/docs/pom.xml index e798b1ae52f..08c487c1ff5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -35,8 +35,8 @@ UTF-8 5.1.0 6.2.5 - - 7.0.12 + + 7.0.13 ${glassfish.version.7x} ${glassfish.version.7x} diff --git a/docs/security-guide/src/main/asciidoc/running-in-secure-environment.adoc b/docs/security-guide/src/main/asciidoc/running-in-secure-environment.adoc index f757fa545bc..190db74b4d1 100644 --- a/docs/security-guide/src/main/asciidoc/running-in-secure-environment.adoc +++ b/docs/security-guide/src/main/asciidoc/running-in-secure-environment.adoc @@ -75,7 +75,7 @@ might cause great damage to companies or individual clients that use the Web site. Understanding the security ramifications of each resource will help you protect it properly. -See Also: `http://www.oracle.com/us/products/ondemand/index.html`[[gksce]][[read-security-publications]] +See Also: `http://www.oracle.com/us/products/ondemand/index.html` [[gksce]][[read-security-publications]] ==== Read Security Publications diff --git a/docs/website/src/main/resources/README.md b/docs/website/src/main/resources/README.md index ac3133dcb6e..1e2375cdfee 100644 --- a/docs/website/src/main/resources/README.md +++ b/docs/website/src/main/resources/README.md @@ -9,6 +9,20 @@ sponsored by the Eclipse Foundation. ## Latest News +## February 29, 2024 -- Eclipse GlassFish 7.0.13 Available + +We are very happy to bring you Eclipse GlassFish 7.0.13. + +Download links are available from the [GlassFish Download page](download.md). + +In the release for this month we replaced many synchronized blocks by reentrant locks (to accommodate JDK 21 virtual threads). + +We also looked at SSO between clusters, and fixed a long standing bug there. + +A long running investigation into potential resource leaks finally came to a conclusion, and resulted in many fixes throughout the code base. The admin console also saw various improvements, specifically with respect to loading. + +Download links are available from the [GlassFish Download page](download.md) + ## January 30, 2024 -- Eclipse GlassFish 7.0.12 Available diff --git a/docs/website/src/main/resources/download.md b/docs/website/src/main/resources/download.md index b5ab6953e04..70fa873fafc 100644 --- a/docs/website/src/main/resources/download.md +++ b/docs/website/src/main/resources/download.md @@ -2,26 +2,26 @@ ## Eclipse GlassFish 7.x -GlassFish 7.0.12 is a final release, containing final Jakarta EE 10 APIs. It compiles and runs on JDK 11 to JDK 21. MicroProfile support requires JDK 17 or higher. +GlassFish 7.0.13 is a final release, containing final Jakarta EE 10 APIs. It compiles and runs on JDK 11 to JDK 21. MicroProfile support requires JDK 17 or higher. -GlassFish 7.0.12 compiles and passes all internal tests using OpenJDK 21. Several Jakarta EE 10 TCKs passed on JDK 21 as well. The Jakarta EE 10 TCK as a whole is not JDK 21 compatible and it's not possible to run all the Jakarta EE TCK tests. +GlassFish 7.0.13 compiles and passes all internal tests using OpenJDK 21. Several Jakarta EE 10 TCKs passed on JDK 21 as well. The Jakarta EE 10 TCK as a whole is not JDK 21 compatible and it's not possible to run all the Jakarta EE TCK tests. -This release we focused on finding and fixing the root cause of several "strange" WebSocket related bugs that we witnessed in the past. We also did a similar thing related to several issues with running apps on the default context root, especially where after authentication redirects happened to another URL. +In the release for this month we replaced many synchronized blocks by reentrant locks (to accommodate JDK 21 virtual threads). -Furthermore we looked into problems with authentication and SSO in a cluster and did some initial fixes. Handling and processing of logging was looked at once again, something we have been improving a lot step by step through various iterations of releases. +We also looked at SSO between clusters, and fixed a long standing bug there. -Finally but not least a nasty ConcurrentModificationException was fixed, and a memory leak (via HK2) was solved. +A long running investigation into potential resource leaks finally came to a conclusion, and resulted in many fixes throughout the code base. The admin console also saw various improvements, specifically with respect to loading. Download: -* [Eclipse GlassFish 7.0.12, Jakarta EE Platform, 10](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/glassfish-7.0.12.zip) -* [Eclipse GlassFish 7.0.12, Jakarta EE Web Profile, 10](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/web-7.0.12.zip) -* [Eclipse GlassFish Embedded 7.0.12, Jakarta EE Full Profile, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-all/7.0.12/jar) -* [Eclipse GlassFish Embedded 7.0.12, Jakarta EE Web Profile, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-web/7.0.12/jar) +* [Eclipse GlassFish 7.0.13, Jakarta EE Platform, 10](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/glassfish-7.0.13.zip) +* [Eclipse GlassFish 7.0.13, Jakarta EE Web Profile, 10](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/web-7.0.13.zip) +* [Eclipse GlassFish Embedded 7.0.13, Jakarta EE Full Profile, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-all/7.0.13/jar) +* [Eclipse GlassFish Embedded 7.0.13, Jakarta EE Web Profile, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-web/7.0.13/jar) More details: -* [Eclipse GlassFish 7.0.12 Release Notes](https://github.com/eclipse-ee4j/glassfish/releases/tag/7.0.12) +* [Eclipse GlassFish 7.0.13 Release Notes](https://github.com/eclipse-ee4j/glassfish/releases/tag/7.0.13) * [Jakarte EE Platform Specification Project](https://jakartaee.github.io/jakartaee-platform/) for more info about Jakarta EE 10 diff --git a/docs/website/src/main/resources/download_gf7.md b/docs/website/src/main/resources/download_gf7.md index 5513b7b4627..54d8012e648 100644 --- a/docs/website/src/main/resources/download_gf7.md +++ b/docs/website/src/main/resources/download_gf7.md @@ -1,5 +1,29 @@ # Eclipse GlassFish 7.x Downloads +### GlassFish 7.0.13 + +GlassFish 7.0.13 is a final release, containing final Jakarta EE 10 APIs. It compiles and runs on JDK 11 to JDK 21. MicroProfile support requires JDK 17 or higher. + +GlassFish 7.0.13 compiles and passes all internal tests using OpenJDK 21. Several Jakarta EE 10 TCKs passed on JDK 21 as well. The Jakarta EE 10 TCK as a whole is not JDK 21 compatible and it's not possible to run all the Jakarta EE TCK tests. + +In the release for this month we replaced many synchronized blocks by reentrant locks (to accommodate JDK 21 virtual threads). + +We also looked at SSO between clusters, and fixed a long standing bug there. + +A long running investigation into potential resource leaks finally came to a conclusion, and resulted in many fixes throughout the code base. The admin console also saw various improvements, specifically with respect to loading. + +Download: + +* [Eclipse GlassFish 7.0.13, Jakarta EE Platform, 10](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/glassfish-7.0.13.zip) +* [Eclipse GlassFish 7.0.13, Jakarta EE Web Profile, 10](https://www.eclipse.org/downloads/download.php?file=/ee4j/glassfish/web-7.0.13.zip) +* [Eclipse GlassFish Embedded 7.0.13, Jakarta EE Full Profile, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-all/7.0.13/jar) +* [Eclipse GlassFish Embedded 7.0.13, Jakarta EE Web Profile, 10](https://search.maven.org/artifact/org.glassfish.main.extras/glassfish-embedded-web/7.0.13/jar) + +More details: + +* [Eclipse GlassFish 7.0.13 Release Notes](https://github.com/eclipse-ee4j/glassfish/releases/tag/7.0.13) +* [Jakarte EE Platform Specification Project](https://jakartaee.github.io/jakartaee-platform/) for more info about Jakarta EE 10 + ### GlassFish 7.0.12 diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ArgumentTokenizer.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ArgumentTokenizer.java index 0b9bd305018..a54276b7b58 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ArgumentTokenizer.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ArgumentTokenizer.java @@ -16,7 +16,6 @@ package com.sun.enterprise.admin.cli; -import java.io.*; import java.util.*; import com.sun.enterprise.universal.i18n.LocalStringsImpl; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ExportCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ExportCommand.java index 96af8e9a673..1d946a5318a 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ExportCommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/ExportCommand.java @@ -18,7 +18,6 @@ import java.util.*; import org.jvnet.hk2.annotations.*; -import org.jvnet.hk2.component.*; import org.glassfish.api.Param; import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/More.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/More.java index 05a486170c1..5aad8a603b7 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/More.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/More.java @@ -18,11 +18,7 @@ import java.io.Writer; import java.io.Reader; -import java.io.OutputStreamWriter; -import java.io.InputStreamReader; import java.io.IOException; -import java.io.FileReader; -import java.io.FileNotFoundException; import java.io.BufferedWriter; import java.io.BufferedReader; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java index b583367d181..554c0c04415 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/MultimodeCommand.java @@ -16,7 +16,6 @@ package com.sun.enterprise.admin.cli; -import static com.sun.enterprise.admin.cli.CLICommand.ERROR; import java.io.*; import java.util.*; diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/UnsetCommand.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/UnsetCommand.java index 36238d0406c..f06ce279384 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/UnsetCommand.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/UnsetCommand.java @@ -18,7 +18,6 @@ import java.util.*; import org.jvnet.hk2.annotations.*; -import org.jvnet.hk2.component.*; import org.glassfish.api.Param; import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java index 8da10311154..350d79e0279 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/ConfigModularityJustInTimeInjectionResolver.java @@ -30,9 +30,6 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Logger; /** * create the default ejb-container configbean when non exists and an injection point requires it. diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java index 5ec8f5165ba..21e63a34846 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/GetSetModularityHelper.java @@ -22,8 +22,6 @@ import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; -import java.lang.reflect.Method; -import java.util.Locale; import java.util.StringTokenizer; /** diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java index 2800f384aef..b3112f9b80d 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationParser.java @@ -20,9 +20,6 @@ import com.sun.enterprise.config.modularity.customization.ConfigBeanDefaultValue; import com.sun.enterprise.config.serverbeans.ConfigLoader; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; -import com.sun.enterprise.util.LocalStringManager; -import com.sun.enterprise.util.LocalStringManagerImpl; - import org.glassfish.config.support.GlassFishConfigBean; import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationPopulator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationPopulator.java index 1db7478f257..b7028d4e869 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationPopulator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ConfigurationPopulator.java @@ -17,9 +17,6 @@ package com.sun.enterprise.config.modularity.parser; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; -import com.sun.enterprise.util.LocalStringManager; -import com.sun.enterprise.util.LocalStringManagerImpl; - import org.jvnet.hk2.config.ConfigBeanProxy; import org.jvnet.hk2.config.ConfigParser; import org.jvnet.hk2.config.Dom; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java index 3e736c1097f..9bc41633f93 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/modularity/parser/ModuleConfigurationLoader.java @@ -20,7 +20,6 @@ import com.sun.enterprise.config.modularity.RankedConfigBeanProxy; import com.sun.enterprise.config.modularity.annotation.HasNoDefaultConfiguration; import com.sun.enterprise.config.modularity.customization.ConfigBeanDefaultValue; -import com.sun.enterprise.config.util.ConfigApiLoggerInfo; import com.sun.enterprise.module.bootstrap.StartupContext; import org.glassfish.api.admin.ServerEnvironment; @@ -39,7 +38,6 @@ import java.beans.PropertyVetoException; import java.util.List; -import java.util.logging.Logger; /** * Containing shared functionalists between different derived classes like ConfigSnippetLoader and so on. Shared diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefValidator.java index 5e6aeb7497e..e357f5cb3ba 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ConfigRefValidator.java @@ -23,8 +23,6 @@ import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.logging.LogDomains; - import java.util.logging.Logger; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetName.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetName.java index 1519e9f855f..ac0271e532e 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetName.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/NotDuplicateTargetName.java @@ -20,7 +20,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.ElementType; -import jakarta.validation.ConstraintValidator; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceValidator.java index 2ff895522e1..0cf2307b2dc 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/ReferenceValidator.java @@ -17,11 +17,9 @@ package com.sun.enterprise.config.serverbeans.customvalidators; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.logging.LogDomains; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; -import java.util.logging.Logger; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; import jakarta.validation.UnexpectedTypeException; diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/InstanceRegisterInstanceCommandParameters.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/InstanceRegisterInstanceCommandParameters.java index b8d444e661b..0e197788bde 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/InstanceRegisterInstanceCommandParameters.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/InstanceRegisterInstanceCommandParameters.java @@ -16,13 +16,8 @@ package com.sun.enterprise.config.util; -import java.io.File; -import java.util.List; import java.util.Properties; -import com.sun.enterprise.config.serverbeans.*; import org.glassfish.api.Param; -import org.glassfish.api.admin.CommandParameters; -import org.jvnet.hk2.config.types.Property; /** * Parameters for the remote instance register instance command, which includes params from _create-node and diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/RegisterInstanceCommandParameters.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/RegisterInstanceCommandParameters.java index c266d45ddc3..69631a86d30 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/RegisterInstanceCommandParameters.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/util/RegisterInstanceCommandParameters.java @@ -16,7 +16,6 @@ package com.sun.enterprise.config.util; -import java.util.Properties; import org.glassfish.api.Param; import org.glassfish.api.admin.CommandParameters; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java index 1d3ec759b37..04d614fbe93 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ConfigConfigBeanListener.java @@ -38,7 +38,6 @@ import org.jvnet.hk2.config.UnprocessedChangeEvents; import com.sun.enterprise.config.serverbeans.Config; -import com.sun.logging.LogDomains; import static com.sun.enterprise.config.util.ConfigApiLoggerInfo.*; /** diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java index c44c2e57f9f..96f40adc970 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/CrudResolver.java @@ -24,7 +24,6 @@ import jakarta.inject.Inject; import jakarta.inject.Named; -import java.lang.annotation.Annotation; /** * A config resolver is responsible for finding the target object of a specified type on which a creation command diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java index 4fefac503ac..e87baa2940b 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java @@ -20,7 +20,6 @@ import com.sun.enterprise.util.Utility; import java.io.*; import java.io.InputStream; -import java.net.*; import java.net.URL; import java.nio.charset.Charset; import java.util.*; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCreateCommand.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCreateCommand.java index 88f173cae70..dab5274385e 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCreateCommand.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericCreateCommand.java @@ -28,7 +28,6 @@ import org.glassfish.api.admin.config.Named; import org.glassfish.common.util.admin.GenericCommandModel; import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.component.*; import org.jvnet.hk2.config.*; import java.util.List; @@ -36,8 +35,6 @@ import java.util.ArrayList; import java.util.Collection; -import javax.security.auth.Subject; - import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.admin.AdminCommandSecurity; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java index dd428ac4d56..6b785347611 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/GenericDeleteCommand.java @@ -17,7 +17,6 @@ package org.glassfish.config.support; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.config.serverbeans.CopyConfig; import com.sun.enterprise.config.util.ConfigApiLoggerInfo; import com.sun.enterprise.util.AnnotationUtil; @@ -27,7 +26,6 @@ import org.glassfish.api.admin.*; import org.glassfish.common.util.admin.GenericCommandModel; import org.glassfish.hk2.api.PerLookup; -import org.jvnet.hk2.component.*; import org.jvnet.hk2.config.*; import jakarta.inject.Inject; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java index bac91a5e00a..c474791ee11 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/HttpServicePropertiesUpgrade.java @@ -34,7 +34,6 @@ import java.util.Iterator; import java.util.List; import java.util.logging.Level; -import java.util.logging.Logger; @Service public class HttpServicePropertiesUpgrade extends BaseLegacyConfigurationUpgrade { diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java index 0138a2cd437..347370dc5d7 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java @@ -16,17 +16,9 @@ package org.glassfish.config.support; -import com.sun.enterprise.config.serverbeans.Cluster; -import com.sun.enterprise.config.serverbeans.ServerRef; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import com.sun.enterprise.util.EarlyLogger; import com.sun.enterprise.util.StringUtils; -import java.io.*; import java.net.*; -import java.util.*; -import java.util.logging.Level; import javax.xml.stream.XMLInputFactory; -import static javax.xml.stream.XMLStreamConstants.START_ELEMENT; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import org.glassfish.config.support.DomainXmlPreParser.DomainXmlPreParserException; diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ServerReaderFilter.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ServerReaderFilter.java index a290a02dd9a..913c48f981f 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ServerReaderFilter.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/ServerReaderFilter.java @@ -19,8 +19,6 @@ import java.io.*; import java.net.*; import java.nio.charset.Charset; -import java.util.*; -import java.util.logging.*; import javax.xml.stream.*; /** diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionThree.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionThree.java index aec57e3ec0f..64e3e883007 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionThree.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/ConfigExtensionThree.java @@ -20,7 +20,6 @@ import org.glassfish.api.admin.config.ConfigExtension; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; -import org.jvnet.hk2.config.ConfiguredBy; /** * @author Masoud Kalali diff --git a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBean.java b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBean.java index 8b117bbed54..a1dcd21185c 100644 --- a/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBean.java +++ b/nucleus/admin/config-api/src/test/java/com/sun/enterprise/config/modularity/tests/RankedConfigBean.java @@ -16,12 +16,8 @@ package com.sun.enterprise.config.modularity.tests; -import com.sun.enterprise.config.modularity.ConfigBeanInstaller; import com.sun.enterprise.config.modularity.RankedConfigBeanProxy; -import com.sun.enterprise.config.modularity.annotation.CustomConfiguration; import com.sun.enterprise.config.serverbeans.DomainExtension; -import org.glassfish.hk2.runlevel.RunLevel; -import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.config.Attribute; import org.jvnet.hk2.config.Configured; diff --git a/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiMBean.java b/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiMBean.java index 1334decc23e..c506cece4ef 100644 --- a/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiMBean.java +++ b/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiMBean.java @@ -24,7 +24,6 @@ import javax.management.DynamicMBean; import javax.management.MBeanException; -import javax.naming.NameClassPair; import javax.naming.NamingException; /** diff --git a/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiNameLookupHelper.java b/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiNameLookupHelper.java index 28044f9e4a8..bb3473d2925 100644 --- a/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiNameLookupHelper.java +++ b/nucleus/admin/monitor/src/main/java/com/sun/enterprise/admin/monitor/jndi/JndiNameLookupHelper.java @@ -24,7 +24,6 @@ import java.util.logging.Logger; import java.util.ArrayList; import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; import static org.glassfish.admin.monitor.MLogger.*; public class JndiNameLookupHelper { diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java index b7ba60761da..a14fe368f53 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/MonitoringBootstrap.java @@ -64,7 +64,6 @@ import java.util.Map; import java.util.WeakHashMap; import java.util.Collections; -import java.util.HashMap; import java.util.StringTokenizer; import org.glassfish.external.amx.AMXGlassfish; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java index e29c73c7cca..0c99dcb6cfb 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderManagerDelegateImpl.java @@ -46,7 +46,6 @@ import com.sun.enterprise.config.serverbeans.*; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; -import com.sun.logging.LogDomains; import com.sun.enterprise.util.StringUtils; import java.io.IOException; import java.text.MessageFormat; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java index e4a4826556e..fb64012665e 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderRegistry.java @@ -16,12 +16,9 @@ package org.glassfish.admin.monitor; -import java.io.IOException; import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.logging.Level; -import java.util.logging.Logger; import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; import org.glassfish.flashlight.client.ProbeClientMethodHandle; import org.glassfish.gmbal.ManagedObjectManager; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderUtil.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderUtil.java index 5306c39be30..35edda0b837 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderUtil.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/StatsProviderUtil.java @@ -16,11 +16,9 @@ package org.glassfish.admin.monitor; -import org.glassfish.api.monitoring.ContainerMonitoring; import org.glassfish.flashlight.client.ProbeClientMethodHandle; import java.util.Collection; -import java.util.logging.Level; public class StatsProviderUtil { diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java index c447a78ed55..aaba2c4fb3c 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMStatsProviderBootstrap.java @@ -21,8 +21,6 @@ import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.lang.management.ThreadMXBean; -import java.util.ArrayList; -import java.util.List; import org.jvnet.hk2.annotations.Service; import org.glassfish.api.monitoring.ContainerMonitoring; import org.glassfish.external.probe.provider.PluginPoint; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadInfoStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadInfoStatsProvider.java index fcae1054daf..298625f1afe 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadInfoStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/JVMThreadInfoStatsProvider.java @@ -16,9 +16,7 @@ package org.glassfish.admin.monitor.jvm; -import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; -import java.lang.management.ThreadMXBean; import org.glassfish.external.statistics.CountStatistic; import org.glassfish.external.statistics.StringStatistic; import org.glassfish.external.statistics.impl.CountStatisticImpl; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/ServerRuntimeStatsProvider.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/ServerRuntimeStatsProvider.java index 984e8798fc7..9878ccf884f 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/ServerRuntimeStatsProvider.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/ServerRuntimeStatsProvider.java @@ -18,11 +18,6 @@ import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; -import java.util.List; -import org.glassfish.external.statistics.CountStatistic; -import org.glassfish.external.statistics.impl.CountStatisticImpl; -import org.glassfish.external.statistics.StringStatistic; -import org.glassfish.external.statistics.impl.StringStatisticImpl; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java index 3d459e31ba0..00ef8d24fa4 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/admin/monitor/jvm/statistics/JVMStatsImpl.java @@ -27,10 +27,6 @@ import org.glassfish.admin.monitor.cli.MonitorContract; import org.glassfish.flashlight.MonitoringRuntimeDataRegistry; import org.glassfish.flashlight.datatree.TreeNode; -import java.lang.management.MemoryUsage; -import org.glassfish.flashlight.datatree.MethodInvoker; -import java.util.logging.Logger; -import java.util.logging.Level; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.config.serverbeans.MonitoringService; import org.glassfish.api.admin.ServerEnvironment; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/Average.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/Average.java index 12966ce306d..776ca7fb03f 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/Average.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/Average.java @@ -16,7 +16,6 @@ package org.glassfish.flashlight.statistics; -import org.glassfish.flashlight.datatree.TreeNode; import org.jvnet.hk2.annotations.Contract; import org.glassfish.external.statistics.RangeStatistic; diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/TimeStats.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/TimeStats.java index fd258bd8fc5..188f0b0e265 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/TimeStats.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/TimeStats.java @@ -23,7 +23,6 @@ import org.glassfish.external.statistics.TimeStatistic; import org.glassfish.flashlight.datatree.TreeNode; -import org.jvnet.hk2.annotations.Contract; /** * @author Harpreet Singh diff --git a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/AverageFactory.java b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/AverageFactory.java index a2b6997221e..d658b768363 100644 --- a/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/AverageFactory.java +++ b/nucleus/admin/monitor/src/main/java/org/glassfish/flashlight/statistics/factory/AverageFactory.java @@ -21,7 +21,6 @@ package org.glassfish.flashlight.statistics.factory; -import org.glassfish.flashlight.statistics.*; import org.glassfish.flashlight.statistics.impl.AverageImpl; import org.glassfish.flashlight.statistics.Average; diff --git a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/AbstractProxyRestAdapter.java b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/AbstractProxyRestAdapter.java index 9955b79fc14..2deb0dfcd31 100644 --- a/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/AbstractProxyRestAdapter.java +++ b/nucleus/admin/rest/gf-restadmin-connector/src/main/java/org/glassfish/admin/restconnector/AbstractProxyRestAdapter.java @@ -24,7 +24,6 @@ import java.net.InetAddress; import java.util.List; -import java.util.logging.Logger; /** * Base class for our implementation of Adapter proxies. To avoid early loading of adapter implentations, use a diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/ExceptionFilter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/ExceptionFilter.java index 9b28097f1f3..ae4de764ca6 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/ExceptionFilter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/ExceptionFilter.java @@ -20,12 +20,9 @@ import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerResponseContext; import jakarta.ws.rs.container.ContainerResponseFilter; -import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.ext.Provider; import org.glassfish.admin.rest.Constants; -import org.glassfish.admin.rest.composite.CompositeResource; import org.glassfish.admin.rest.model.ResponseBody; -import org.glassfish.admin.rest.utils.Util; /** * This filter reformats string entities from non-success responses into arrays of message entities (when not using the diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java index 49c9e8546a1..61677e4ff0f 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/JerseyContainerCommandService.java @@ -18,8 +18,6 @@ import com.sun.enterprise.v3.common.PropsFileActionReporter; import java.util.Collections; -import java.util.Map; -import java.util.Properties; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java index 3aecb0e738b..e02e34f1c0a 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/adapter/RestAdapter.java @@ -18,7 +18,6 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.v3.admin.adapter.AdminEndpointDecider; import java.io.IOException; import java.net.HttpURLConnection; import java.util.Collections; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeResource.java index ff0dab6cd5a..36660a88e79 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeResource.java @@ -34,7 +34,6 @@ import jakarta.ws.rs.core.Response.ResponseBuilder; import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.UriBuilder; -import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.glassfish.admin.rest.Constants; import org.glassfish.admin.rest.RestResource; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java index ae8c6e3b49f..1a3719495db 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/HelpText.java @@ -22,7 +22,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import jakarta.inject.Qualifier; -import org.jvnet.hk2.annotations.Contract; /** * Any property for which help text needs to be specified should be marked with this annotation. The help text will be diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestResourceMetadata.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestResourceMetadata.java index 69f33c24efc..96b726175c0 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestResourceMetadata.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/metadata/RestResourceMetadata.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.OPTIONS; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java index b005580c52e..e697dc83555 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/GenerateClientCommand.java @@ -42,7 +42,6 @@ import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientClassWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientClassWriter.java index e0024c3c048..fb49a735112 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientClassWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientClassWriter.java @@ -26,9 +26,7 @@ import java.io.FileWriter; import java.io.IOException; import java.util.Collection; -import java.util.HashSet; import java.util.Locale; -import java.util.Set; /** * diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportXmlProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportXmlProvider.java index 3fe9466e60e..166f42548d2 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportXmlProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/ActionReportXmlProvider.java @@ -17,7 +17,6 @@ package org.glassfish.admin.rest.provider; import com.sun.enterprise.v3.common.ActionReporter; -import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.*; import jakarta.ws.rs.Produces; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/MapWriter.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/MapWriter.java index 1e5aa1dc1c2..0caf8444643 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/MapWriter.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/MapWriter.java @@ -16,9 +16,6 @@ package org.glassfish.admin.rest.provider; -import java.lang.annotation.Annotation; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; import java.util.Map; import java.util.logging.Level; import jakarta.ws.rs.Produces; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java index 0f4cf3e01e4..22c84cd3edd 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/readers/InputObject.java @@ -16,10 +16,6 @@ package org.glassfish.admin.rest.readers; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; import java.util.Iterator; import java.util.Map; import org.glassfish.admin.rest.provider.ProviderUtil; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java index 29932248e30..c48560a0123 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/LeafResource.java @@ -20,12 +20,8 @@ import java.util.Map; import java.util.TreeMap; -import jakarta.inject.Provider; -import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.DELETE; @@ -44,7 +40,6 @@ import com.sun.enterprise.util.LocalStringManagerImpl; import org.glassfish.admin.rest.utils.ResourceUtil; import org.glassfish.admin.rest.utils.Util; -import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.config.Dom; import static org.glassfish.admin.rest.utils.Util.decode; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/PropertiesBagResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/PropertiesBagResource.java index 699ef9d0708..a08d7fec34b 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/PropertiesBagResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/PropertiesBagResource.java @@ -30,7 +30,6 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; @@ -41,7 +40,6 @@ import org.glassfish.admin.rest.results.OptionsResult; import org.glassfish.admin.rest.utils.xml.RestActionReporter; import org.glassfish.api.ActionReport; -import org.glassfish.hk2.api.ServiceLocator; import org.jvnet.hk2.config.Dom; import org.jvnet.hk2.config.types.Property; import org.jvnet.hk2.config.TransactionFailure; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java index 1307d1d4099..f9512fffbf6 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/SessionsResource.java @@ -25,22 +25,17 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import static jakarta.ws.rs.core.Response.Status.FORBIDDEN; import static jakarta.ws.rs.core.Response.Status.OK; import static jakarta.ws.rs.core.Response.Status.UNAUTHORIZED; -import jakarta.ws.rs.core.UriInfo; - -import org.glassfish.admin.rest.adapter.LocatorBridge; import org.glassfish.admin.rest.results.ActionReportResult; import org.glassfish.admin.rest.utils.ResourceUtil; import org.glassfish.admin.rest.utils.xml.RestActionReporter; import org.glassfish.admin.restconnector.RestConfig; import org.glassfish.common.util.admin.RestSessionManager; import org.glassfish.grizzly.http.server.Request; -import org.glassfish.internal.api.AdminAccessController; import org.glassfish.internal.api.RemoteAdminAccessException; import org.glassfish.jersey.internal.util.collection.Ref; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java index 7cb16ab3f80..714ff41d3fe 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandDeleteResource.java @@ -35,8 +35,6 @@ import org.glassfish.admin.rest.utils.ResourceUtil; import org.glassfish.api.admin.ParameterMap; -import static org.glassfish.admin.rest.resources.TemplateExecCommand.localStrings; - /** * * @author ludovic champenois ludo@dev.java.net Code moved from generated classes to here. Gen code inherits from this diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java index 314f808d30a..a8e41c0ca39 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateCommandGetResource.java @@ -23,8 +23,6 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.glassfish.admin.rest.Constants; -import org.glassfish.admin.rest.results.ActionReportResult; - import org.glassfish.jersey.media.sse.SseFeature; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateExecCommand.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateExecCommand.java index 27e5f9582dd..27081540840 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateExecCommand.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateExecCommand.java @@ -50,7 +50,6 @@ import org.codehaus.jettison.json.JSONException; import org.glassfish.admin.rest.Constants; import org.glassfish.admin.rest.OptionsCapable; -import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.composite.CompositeUtil; import org.glassfish.admin.rest.composite.metadata.RestResourceMetadata; import org.glassfish.admin.rest.utils.Util; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/JmxServiceUrlsResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/JmxServiceUrlsResource.java index 58650347a01..3f9549a31da 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/JmxServiceUrlsResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/JmxServiceUrlsResource.java @@ -19,7 +19,6 @@ import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.List; -import jakarta.inject.Inject; import javax.management.JMException; import javax.management.MBeanServer; import javax.management.ObjectName; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/SetDomainConfigResource.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/SetDomainConfigResource.java index d47468a7177..1e241c9ba97 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/SetDomainConfigResource.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/custom/SetDomainConfigResource.java @@ -26,7 +26,6 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.glassfish.admin.rest.resources.TemplateCommandPostResource; -import org.glassfish.admin.rest.results.ActionReportResult; import org.glassfish.api.admin.ParameterMap; import org.jvnet.hk2.config.Dom; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/results/OptionsResult.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/results/OptionsResult.java index a9a6843364c..0ecc1c85fbd 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/results/OptionsResult.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/results/OptionsResult.java @@ -19,8 +19,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import java.util.TreeMap; - import org.glassfish.admin.rest.provider.MethodMetaData; /** diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonScope.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonScope.java index c50a516b82d..6a049afa414 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonScope.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/JsonScope.java @@ -18,8 +18,6 @@ import java.util.Stack; -import org.glassfish.admin.rest.model.ResponseBody; - /** * @author tmoreau */ diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/SseCommandHelper.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/SseCommandHelper.java index c77a9a32e2c..41b45582d4f 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/SseCommandHelper.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/SseCommandHelper.java @@ -20,7 +20,6 @@ import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.v3.admin.JobManagerService; import com.sun.enterprise.v3.common.PropsFileActionReporter; -import com.sun.logging.LogDomains; import java.io.IOException; import java.util.logging.Level; import jakarta.ws.rs.core.MediaType; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Util.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Util.java index 40e89dcd4ca..45d9bd01a5b 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Util.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/Util.java @@ -45,7 +45,6 @@ import jakarta.ws.rs.core.HttpHeaders; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import org.glassfish.admin.rest.Constants; import org.glassfish.admin.rest.RestLogging; import org.glassfish.admin.rest.utils.xml.RestActionReporter; diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlObject.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlObject.java index 6f2446ee0d3..88fc9a2ba3a 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlObject.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/xml/XmlObject.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import java.util.logging.Level; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.OutputKeys; import javax.xml.transform.Result; @@ -29,8 +28,6 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.glassfish.admin.rest.RestLogging; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyResource.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyResource.java index e31bb6d1bf4..1ea3b777d6d 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyResource.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/composite/resource/DummyResource.java @@ -18,7 +18,6 @@ import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; diff --git a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/model/RelatedModel.java b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/model/RelatedModel.java index 22cff7f5583..3ba323bf5d9 100644 --- a/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/model/RelatedModel.java +++ b/nucleus/admin/rest/rest-service/src/test/java/org/glassfish/admin/rest/model/RelatedModel.java @@ -16,8 +16,6 @@ package org.glassfish.admin.rest.model; -import org.glassfish.admin.rest.composite.RestModel; - public interface RelatedModel { public String getId(); public void setId(String id); diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/InstancesManager.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/InstancesManager.java index fb868b1c512..e4618fe5480 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/InstancesManager.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/InstancesManager.java @@ -16,7 +16,6 @@ package com.sun.enterprise.admin.servermgmt; -import java.util.Map; import java.util.Properties; /** diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java index 1c9868d170a..f0a99a359f7 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/RepositoryManager.java @@ -20,7 +20,6 @@ import com.sun.enterprise.admin.servermgmt.pe.PEDomainsManager; import com.sun.enterprise.admin.servermgmt.pe.PEFileLayout; import com.sun.enterprise.admin.util.LineTokenReplacer; -import com.sun.enterprise.admin.util.TokenValue; import com.sun.enterprise.admin.util.TokenValueSet; import com.sun.enterprise.security.store.PasswordAdapter; import com.sun.enterprise.util.OS; @@ -38,8 +37,6 @@ import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.i18n.StringManager; import com.sun.enterprise.util.io.FileUtils; -import com.sun.enterprise.util.zip.ZipFile; - //import com.sun.enterprise.admin.common.Status; //import com.sun.enterprise.util.system.GFSystem; import java.io.File; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateServiceCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateServiceCommand.java index 051e42872b2..fd73d12f84f 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateServiceCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/CreateServiceCommand.java @@ -20,7 +20,6 @@ import com.sun.enterprise.util.OS; import com.sun.enterprise.util.io.FileUtils; import java.io.*; -import java.util.*; import java.util.logging.*; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DeleteServiceCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DeleteServiceCommand.java index 085d4b030c5..5fb19c0d2c5 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DeleteServiceCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/DeleteServiceCommand.java @@ -20,7 +20,6 @@ import com.sun.enterprise.util.OS; import com.sun.enterprise.util.io.FileUtils; import java.io.*; -import java.util.*; import java.util.logging.*; import org.glassfish.hk2.api.PerLookup; @@ -33,11 +32,8 @@ import com.sun.enterprise.admin.servermgmt.services.PlatformServicesInfo; import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.universal.io.SmartFile; -import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.io.ServerDirs; -import static com.sun.enterprise.util.StringUtils.ok; - /** * Delete a "service" in the operating system. * diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerCommand.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerCommand.java index 932626c7819..a9858e2a89b 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerCommand.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StartServerCommand.java @@ -17,7 +17,6 @@ package com.sun.enterprise.admin.servermgmt.cli; import com.sun.enterprise.admin.launcher.GFLauncherException; -import com.sun.enterprise.admin.launcher.GFLauncherFactory; import com.sun.enterprise.universal.xml.MiniXmlParserException; import java.util.List; import org.glassfish.api.admin.RuntimeType; diff --git a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java index 0fac12f71a4..09f213c5d07 100644 --- a/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java +++ b/nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/pe/PEDomainConfigValidator.java @@ -25,7 +25,6 @@ import com.sun.enterprise.util.i18n.StringManager; import java.util.HashSet; import java.util.Iterator; -import java.util.Map.Entry; import java.util.Map; import java.util.Set; import java.util.TreeMap; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java index c583ae89a8b..fda7f0c7e6c 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java @@ -1,4 +1,5 @@ /* + * Copyright (c) 2024 Contributors to the Eclipse Foundation. * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -123,7 +124,9 @@ protected synchronized void fireEvent(ProgressStatusEvent event) { public void setEventBroker(AdminCommandEventBroker eventBroker) { this.eventBroker = eventBroker; if (eventBroker != null) { - eventBroker.fireEvent(EVENT_PROGRESSSTATUS_STATE, this); + // Pass an empty progress status to prevent duplicate children creation + // on the client side. This status is only used to send a state event. + eventBroker.fireEvent(EVENT_PROGRESSSTATUS_STATE, new CommandProgressImpl(name, id)); } } diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/ManifestManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/ManifestManager.java index d7c201d1c5f..ef2032abfcc 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/ManifestManager.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/ManifestManager.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.universal.NameValue; import com.sun.enterprise.universal.glassfish.AdminCommandResponse; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AuthenticationInfo.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AuthenticationInfo.java index 10ae8d41053..6697764a798 100755 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AuthenticationInfo.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/AuthenticationInfo.java @@ -16,8 +16,6 @@ package com.sun.enterprise.admin.util; -import com.sun.enterprise.util.StringUtils; - /** * A class that holds the user and password for the connection to the server. Used by the HttpConnectorAddress class. * Instances of this class are immutable. diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java index 2a1933951c1..09cc65c407f 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandSecurityChecker.java @@ -20,7 +20,6 @@ import java.lang.reflect.Field; import java.net.URI; import java.net.URISyntaxException; -import java.security.Principal; import java.security.PrivilegedAction; import java.util.*; import java.util.logging.Level; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java index 1cb575a4e04..a91ed13cacc 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/CommandThreadPool.java @@ -31,8 +31,6 @@ import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.hk2.runlevel.RunLevel; -import jakarta.inject.Singleton; - import jakarta.inject.Inject; import java.util.List; import java.util.concurrent.*; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/LineTokenReplacer.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/LineTokenReplacer.java index be81cc76f93..035ee336a32 100755 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/LineTokenReplacer.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/LineTokenReplacer.java @@ -27,8 +27,6 @@ import java.nio.charset.Charset; import java.io.*; -import java.util.logging.Level; -import java.util.logging.Logger; /** */ diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java index 67d72fbbc5f..34be0fcbde5 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/NamedResourceManager.java @@ -27,8 +27,6 @@ import java.util.regex.Pattern; import jakarta.inject.Singleton; import org.glassfish.api.admin.NamedResource; -import org.glassfish.logging.annotation.LogMessagesResourceBundle; -import org.glassfish.logging.annotation.LoggerInfo; import org.jvnet.hk2.annotations.Service; /** diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/RemoteInstanceCommandHelper.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/RemoteInstanceCommandHelper.java index cddaaa82870..c6fa6514d81 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/RemoteInstanceCommandHelper.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/RemoteInstanceCommandHelper.java @@ -18,12 +18,9 @@ import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.config.serverbeans.*; -import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.hk2.api.ServiceLocator; import java.util.*; -import org.glassfish.config.support.GlassFishConfigBean; -import org.glassfish.config.support.PropertyResolver; /** * @author Byron Nevins diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheMemStore.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheMemStore.java index 2400cc8316b..6375baba0b3 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheMemStore.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/AdminCacheMemStore.java @@ -20,8 +20,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; /** * In memory {@link AdminCache} containing fixed amount of items. Rotation is based on last update first out.
diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/CommandModelDataProvider.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/CommandModelDataProvider.java index 32a3405c94f..71badafcb97 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/CommandModelDataProvider.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/cache/CommandModelDataProvider.java @@ -21,7 +21,6 @@ import com.sun.enterprise.admin.util.CommandModelData.ParamModelData; import java.io.*; import java.nio.charset.Charset; -import javax.xml.stream.*; import org.glassfish.api.Param; import org.glassfish.api.admin.CommandModel; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/test/TokenReplacementTester.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/test/TokenReplacementTester.java index 8d4b0784598..13d97b20849 100755 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/test/TokenReplacementTester.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/util/test/TokenReplacementTester.java @@ -20,7 +20,6 @@ import com.sun.enterprise.admin.util.TokenValue; import com.sun.enterprise.admin.util.TokenValueSet; -import java.io.File; import java.io.FileReader; import java.io.BufferedReader; import java.util.StringTokenizer; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java index 90bcf96152d..c4ce829ee71 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateInstanceCommand.java @@ -42,7 +42,6 @@ import org.glassfish.internal.api.ServerContext; import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import java.util.logging.Logger; import jakarta.inject.Inject; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java index ff4df05217c..a93ba6b9a79 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeConfigCommand.java @@ -27,7 +27,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import java.util.Map; import java.util.HashMap; import com.sun.enterprise.util.net.NetUtils; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java index 83011fe377c..1b1b837373a 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateNodeImplicitCommand.java @@ -29,7 +29,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; /** * Remote AdminCommand to create a config node. This command is run only on DAS. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java index 217d2b5d201..83c759f6b40 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/CreateRemoteNodeCommand.java @@ -34,9 +34,6 @@ import jakarta.inject.Inject; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; - /** * Refactored from CreateNodeSshCommand.java on 9/10/11 * Note the use of "protected" visibility is one of those rare times when it is actually diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java index 8a33fcae8ba..2999630a036 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteConfigCommand.java @@ -25,7 +25,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import org.jvnet.hk2.config.*; import org.glassfish.api.Param; import org.glassfish.api.ActionReport; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java index 285e4dbe83d..645f1b79e71 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteInstanceCommand.java @@ -17,7 +17,6 @@ package com.sun.enterprise.v3.admin.cluster; import com.sun.enterprise.config.serverbeans.*; -import com.sun.enterprise.util.SystemPropertyConstants; import com.sun.enterprise.util.StringUtils; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; @@ -31,7 +30,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import java.util.logging.Logger; import java.util.List; import java.util.ArrayList; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java index 839e3226c8e..c0c3dfbaac5 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/DeleteNodeSshCommand.java @@ -23,11 +23,7 @@ import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; -import jakarta.inject.Inject; - - import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; /** diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java index bbf876bdbd9..b47ba0ca122 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListClustersCommand.java @@ -32,7 +32,6 @@ import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; import java.util.List; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java index 589798b2f98..77d901526cb 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesCommand.java @@ -30,7 +30,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import java.util.logging.Logger; import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java index 825c7ef2dc5..374cc8a3df2 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesConfigCommand.java @@ -30,7 +30,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import java.util.logging.Logger; import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java index 353f8b14c38..0f47122cb24 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ListNodesSshCommand.java @@ -29,7 +29,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import java.util.logging.Logger; import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java index 66bfb97860e..6059fee5afe 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/NodeAgentConfigUpgrade.java @@ -38,7 +38,6 @@ import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; -import org.jvnet.hk2.component.*; import org.jvnet.hk2.config.*; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java index 0c22edce213..9398cca18eb 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeRemoteCommand.java @@ -20,14 +20,11 @@ import com.sun.enterprise.config.serverbeans.Node; import com.sun.enterprise.util.StringUtils; import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.admin.*; import jakarta.inject.Inject; import java.util.logging.Logger; -import org.jvnet.hk2.annotations.Service; -import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; /** diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java index 7cbb8b5b06d..53849c96214 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/PingNodeSshCommand.java @@ -19,9 +19,6 @@ import com.sun.enterprise.config.serverbeans.Node; import org.glassfish.api.I18n; import org.glassfish.api.admin.*; -import jakarta.inject.Inject; - - import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java index 0c1989b95fd..fef82be8733 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/RestartInstanceCommand.java @@ -24,7 +24,6 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.util.ObjectAnalyzer; import com.sun.enterprise.util.StringUtils; -import java.util.Map; import java.util.logging.Logger; import java.util.logging.Level; import org.glassfish.api.*; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java index 8b7496eff75..c221c82fce3 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StartClusterCommand.java @@ -25,7 +25,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.ActionReport; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java index 007c9a9cfe2..3a9d741c10e 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopClusterCommand.java @@ -23,7 +23,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.ActionReport; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java index 44292b343df..39f12bb2e0e 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/StopInstanceCommand.java @@ -42,7 +42,6 @@ import jakarta.inject.Inject; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java index 7c659bd55d7..363290232d1 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeCommand.java @@ -39,7 +39,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import org.jvnet.hk2.config.*; import java.util.logging.Logger; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java index 482fd5f493a..6f0ff3ced9f 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeConfigCommand.java @@ -31,7 +31,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import java.util.logging.Logger; /** diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java index 106b0e5825b..d9bda89950e 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeRemoteCommand.java @@ -23,13 +23,10 @@ import com.sun.enterprise.config.serverbeans.SshConnector; import com.sun.enterprise.config.serverbeans.SshAuth; import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; import org.glassfish.api.Param; import org.glassfish.api.admin.*; import org.glassfish.api.admin.CommandRunner.CommandInvocation; import org.glassfish.hk2.api.ServiceLocator; -import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import java.util.logging.Logger; import jakarta.inject.Inject; diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java index d20dab3e16e..3ad2bb7da29 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/UpdateNodeSshCommand.java @@ -23,11 +23,7 @@ import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; -import jakarta.inject.Inject; - - import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; /** * Remote AdminCommand to update an ssh node. This command is run only on DAS. diff --git a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java index 3b8d8871636..d35481df4b6 100644 --- a/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java +++ b/nucleus/cluster/admin/src/main/java/com/sun/enterprise/v3/admin/cluster/ValidateNodeCommand.java @@ -33,7 +33,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import java.util.logging.Logger; import java.util.logging.Level; import java.io.File; diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java index 0cf14c30fcc..a9724a860d0 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateLocalInstanceFilesystemCommand.java @@ -22,11 +22,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.*; -import jakarta.inject.Inject; - - import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import org.glassfish.api.Param; import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java index 823911d5b87..cb3e1e3b0ae 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/CreateNodeAgentCommand.java @@ -16,19 +16,10 @@ package com.sun.enterprise.admin.cli.cluster; -import java.io.File; -import java.io.Console; -import java.util.*; -import jakarta.inject.Inject; - - -import org.jvnet.hk2.component.*; -import org.glassfish.api.Param; import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; import com.sun.enterprise.admin.cli.*; -import com.sun.enterprise.util.SystemPropertyConstants; /** * This is a local command that creates a node agent. diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java index a2df2d3cbb5..1e165c35989 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/InstallNodeBaseCommand.java @@ -24,7 +24,6 @@ import com.sun.enterprise.util.zip.ZipFileException; import com.sun.enterprise.util.zip.ZipWriter; import java.io.*; -import java.net.*; import org.glassfish.api.Param; import org.glassfish.api.admin.CommandException; import jakarta.inject.Inject; @@ -36,7 +35,6 @@ import java.io.File; import java.io.IOException; -import java.net.InetAddress; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; diff --git a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateDasOptions.java b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateDasOptions.java index 7ea197282f3..e2ac8807645 100644 --- a/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateDasOptions.java +++ b/nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/ValidateDasOptions.java @@ -20,7 +20,6 @@ import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.component.*; import org.glassfish.api.Param; import org.glassfish.api.admin.*; import org.glassfish.hk2.api.PerLookup; diff --git a/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/SyncRequest.java b/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/SyncRequest.java index 50184590e81..d44f1b471ab 100644 --- a/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/SyncRequest.java +++ b/nucleus/cluster/common/src/main/java/com/sun/enterprise/util/cluster/SyncRequest.java @@ -16,7 +16,6 @@ package com.sun.enterprise.util.cluster; -import java.io.*; import java.util.*; import jakarta.xml.bind.annotation.*; diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java index d3234cd56f7..762dd057ca3 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/GMSAdapterImpl.java @@ -67,7 +67,6 @@ import com.sun.enterprise.ee.cms.core.GMSConstants; import com.sun.enterprise.ee.cms.core.GMSException; import com.sun.enterprise.ee.cms.core.GMSFactory; -import com.sun.enterprise.ee.cms.core.GroupLeadershipNotificationActionFactory; import com.sun.enterprise.ee.cms.core.GroupManagementService; import com.sun.enterprise.ee.cms.core.JoinNotificationActionFactory; import com.sun.enterprise.ee.cms.core.JoinedAndReadyNotificationActionFactory; @@ -87,7 +86,6 @@ import com.sun.enterprise.mgmt.transport.NetworkUtility; import com.sun.enterprise.mgmt.transport.grizzly.GrizzlyConfigConstants; import com.sun.enterprise.util.io.ServerDirs; -import com.sun.logging.LogDomains; /** * @author Sheetal.Vartak@Sun.COM diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java index 3866cae1c16..78c830766ec 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStartClusterCommand.java @@ -18,8 +18,6 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.enterprise.ee.cms.core.GroupManagementService; -import com.sun.logging.LogDomains; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.*; diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStopClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStopClusterCommand.java index 4cf92460095..f86449c69d6 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStopClusterCommand.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceAfterStopClusterCommand.java @@ -18,7 +18,6 @@ import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.ee.cms.core.GMSConstants; -import com.sun.logging.LogDomains; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.*; diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java index 2c70f01dd5c..2203b47e665 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStartClusterCommand.java @@ -16,7 +16,6 @@ package org.glassfish.gms.admin; -import com.sun.logging.LogDomains; import org.glassfish.gms.bootstrap.GMSAdapterService; import org.glassfish.gms.bootstrap.GMSAdapter; import com.sun.enterprise.config.serverbeans.*; diff --git a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java index 596e0f90a84..13ec4d77ddb 100644 --- a/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java +++ b/nucleus/cluster/gms-adapter/src/main/java/org/glassfish/gms/admin/GMSAnnounceBeforeStopClusterCommand.java @@ -16,7 +16,6 @@ package org.glassfish.gms.admin; -import com.sun.logging.LogDomains; import org.glassfish.gms.bootstrap.GMSAdapterService; import org.glassfish.gms.bootstrap.GMSAdapter; import com.sun.enterprise.config.serverbeans.*; diff --git a/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/HealthHistory.java b/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/HealthHistory.java index 4535299573d..40b88b1cd47 100644 --- a/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/HealthHistory.java +++ b/nucleus/cluster/gms-bootstrap/src/main/java/org/glassfish/gms/bootstrap/HealthHistory.java @@ -21,7 +21,6 @@ import com.sun.enterprise.config.serverbeans.ServerRef; import com.sun.enterprise.ee.cms.core.*; import com.sun.enterprise.util.i18n.StringManager; -import com.sun.logging.LogDomains; import org.glassfish.logging.annotation.LogMessageInfo; import org.glassfish.logging.annotation.LogMessagesResourceBundle; import org.glassfish.logging.annotation.LoggerInfo; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java index 9ad9e6612b9..8c8770278b1 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigLoader.java @@ -35,7 +35,6 @@ import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; import org.glassfish.admin.amx.impl.util.SingletonEnforcer; import org.glassfish.admin.amx.util.AMXLoggerInfo; -import org.glassfish.admin.amx.util.ExceptionUtil; import org.glassfish.admin.amx.util.FeatureAvailability; import org.glassfish.admin.amx.util.MapUtil; import org.glassfish.admin.amx.util.TypeCast; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java index db74c1acd2e..99fa1586cef 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/AMXConfigStartupService.java @@ -27,20 +27,14 @@ import org.jvnet.hk2.annotations.Service; import jakarta.inject.Inject; -import javax.management.JMException; import javax.management.MBeanServer; import javax.management.ObjectName; -import javax.management.StandardMBean; - - import org.glassfish.external.arc.Stability; import org.glassfish.external.arc.Taxonomy; -import org.glassfish.admin.amx.config.AMXConfigConstants; import org.glassfish.admin.amx.impl.util.ImplUtil; import org.glassfish.admin.amx.impl.util.InjectedValues; import org.glassfish.admin.amx.util.AMXLoggerInfo; -import org.glassfish.admin.amx.util.FeatureAvailability; import org.glassfish.admin.mbeanserver.PendingConfigBeans; import org.glassfish.api.amx.AMXLoader; import org.jvnet.hk2.config.Transactions; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java index 1d6a060cbdc..c8c9c89c273 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java @@ -33,7 +33,6 @@ import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.core.proxy.ProxyFactory; import org.glassfish.admin.amx.impl.AMXStartupService; -import org.glassfish.admin.amx.impl.util.ImplUtil; import org.glassfish.admin.amx.impl.util.MBeanInfoSupport; import org.glassfish.admin.amx.impl.util.ObjectNameBuilder; import org.glassfish.admin.amx.util.*; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ComplianceMonitor.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ComplianceMonitor.java index 37cf1e7a3b7..bbb12a2b6ae 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ComplianceMonitor.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ComplianceMonitor.java @@ -29,7 +29,6 @@ import javax.management.*; import org.glassfish.admin.amx.base.DomainRoot; import org.glassfish.admin.amx.core.AMXValidator; -import org.glassfish.admin.amx.impl.util.ImplUtil; import org.glassfish.admin.amx.util.AMXLoggerInfo; import org.glassfish.admin.amx.util.jmx.JMXUtil; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/PathnamesImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/PathnamesImpl.java index 585833855c8..e3e1d1f5588 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/PathnamesImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/PathnamesImpl.java @@ -33,7 +33,6 @@ import org.glassfish.admin.amx.core.PathnameParser; import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.core.proxy.AMXProxyHandler; -import org.glassfish.admin.amx.impl.util.ImplUtil; import org.glassfish.admin.amx.util.AMXLoggerInfo; import org.glassfish.admin.amx.util.CollectionUtil; import org.glassfish.admin.amx.util.ExceptionUtil; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java index a25bbd32615..4c0da186353 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java @@ -29,15 +29,10 @@ import org.glassfish.admin.amx.util.ListUtil; import org.glassfish.admin.amx.util.StringUtil; import org.glassfish.admin.amx.util.SetUtil; -import org.glassfish.admin.amx.base.DomainRoot; - -import org.glassfish.admin.amx.impl.util.ImplUtil; - import com.sun.enterprise.config.serverbeans.AuthRealm; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.SecurityService; import com.sun.enterprise.config.serverbeans.Config; -import com.sun.enterprise.config.serverbeans.Configs; import org.jvnet.hk2.config.types.Property; import org.glassfish.internal.api.Globals; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RuntimeRootImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RuntimeRootImpl.java index 0fae8f0b78e..1a1419afc0f 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RuntimeRootImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RuntimeRootImpl.java @@ -33,7 +33,6 @@ import javax.management.remote.JMXServiceURL; import org.glassfish.admin.amx.base.RuntimeRoot; import org.glassfish.admin.amx.base.ServerRuntime; -import org.glassfish.admin.amx.impl.util.ImplUtil; import org.glassfish.api.admin.AdminCommandContextImpl; import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.grizzly.config.dom.NetworkConfig; @@ -41,8 +40,6 @@ import org.glassfish.grizzly.config.dom.Protocol; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.admin.amx.util.ExceptionUtil; -import org.glassfish.internal.data.ApplicationRegistry; - import org.glassfish.admin.amx.impl.util.InjectedValues; import org.glassfish.external.amx.AMXGlassfish; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java index 27a558ebd85..9806d12af39 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SampleImpl.java @@ -22,24 +22,17 @@ import javax.management.MBeanInfo; import javax.management.ObjectName; import javax.management.openmbean.*; -import javax.management.remote.JMXServiceURL; - import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.List; -import java.util.ArrayList; -import java.util.HashSet; - import org.glassfish.admin.amx.base.Sample; import org.glassfish.admin.amx.util.jmx.JMXUtil; import org.glassfish.admin.amx.util.jmx.OpenMBeanUtil; import org.glassfish.admin.amx.util.MapUtil; import org.glassfish.admin.amx.util.ListUtil; import org.glassfish.admin.amx.util.SetUtil; -import org.glassfish.admin.amx.util.StringUtil; - import org.glassfish.admin.amx.util.CollectionUtil; import org.glassfish.admin.amx.core.Util; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java index 1690d015e05..8a166c6f4ce 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java @@ -25,7 +25,6 @@ import javax.management.MBeanInfo; import javax.management.ObjectName; -import javax.management.InstanceNotFoundException; import org.glassfish.admin.amx.base.Pathnames; import org.glassfish.admin.amx.base.Tools; import org.glassfish.admin.amx.core.AMXValidator; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/MBeanInfoSupport.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/MBeanInfoSupport.java index 8bfd988bbee..b1b2e9ee513 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/MBeanInfoSupport.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/MBeanInfoSupport.java @@ -29,9 +29,7 @@ import java.util.logging.Level; import javax.management.Descriptor; import javax.management.MBeanAttributeInfo; -import javax.management.MBeanConstructorInfo; import javax.management.MBeanInfo; -import javax.management.MBeanNotificationInfo; import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; import javax.management.ObjectName; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java index 2df1211d946..93821eec8f0 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java @@ -22,13 +22,10 @@ import java.util.List; import javax.management.MBeanServer; import javax.management.ObjectName; -import org.glassfish.admin.amx.base.DomainRoot; import org.glassfish.admin.amx.core.AMXProxy; import org.glassfish.admin.amx.core.Util; import org.glassfish.admin.amx.core.proxy.ProxyFactory; import org.glassfish.admin.amx.util.jmx.JMXUtil; -import org.glassfish.admin.amx.util.stringifier.SmartStringifier; - import static org.glassfish.external.amx.AMX.*; /** diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/CollectionUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/CollectionUtil.java index 58535ee49e4..5182f1ffeeb 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/CollectionUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/CollectionUtil.java @@ -16,7 +16,6 @@ package org.glassfish.admin.amx.util; -import java.util.Arrays; import java.util.List; import java.util.ArrayList; import java.util.Collection; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java index e464eee81d3..fd24b22158d 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java @@ -16,7 +16,6 @@ package org.glassfish.admin.amx.util; -import javax.management.MBeanServer; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java index f1756a646e4..14e2e4e3ebf 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java @@ -20,8 +20,6 @@ import org.glassfish.admin.amx.util.ObjectUtil; import org.glassfish.admin.amx.util.Output; import org.glassfish.admin.amx.util.StringUtil; -import org.glassfish.admin.amx.util.ClassUtil; - import javax.management.*; import java.io.IOException; import java.lang.reflect.Method; diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/Version.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/Version.java index 263ee4e657c..3244c5d0263 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/Version.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/server/util/Version.java @@ -23,7 +23,6 @@ import java.io.FileReader; import java.io.IOException; import java.nio.file.Path; -import java.time.Instant; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BoundedMultiLruCache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BoundedMultiLruCache.java index 4eda2b39b9f..26908330b19 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BoundedMultiLruCache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/BoundedMultiLruCache.java @@ -21,7 +21,6 @@ import java.util.Properties; import java.util.Map; -import java.util.ResourceBundle; import java.util.Locale; /** diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/Cache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/Cache.java index 09e76fc239d..bb34ee733af 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/Cache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/Cache.java @@ -16,7 +16,6 @@ package com.sun.appserv.util.cache; -import java.util.ArrayList; import java.util.Iterator; import java.util.Enumeration; import java.util.Map; diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/LruCache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/LruCache.java index 778d232374f..c65ed7469cb 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/LruCache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/LruCache.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import java.util.Map; import java.util.Properties; -import java.util.ResourceBundle; /** * LRUCache diff --git a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/MultiLruCache.java b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/MultiLruCache.java index 99d5da6ec80..3894ef01885 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/MultiLruCache.java +++ b/nucleus/common/common-util/src/main/java/com/sun/appserv/util/cache/MultiLruCache.java @@ -16,11 +16,8 @@ package com.sun.appserv.util.cache; -import java.text.MessageFormat; - import java.util.Properties; import java.util.Map; -import java.util.ResourceBundle; /** * MultiLruCache -- in-memory bounded LRU cache with multiple LRU lists diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/admin/monitor/callflow/ThreadLocalData.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/admin/monitor/callflow/ThreadLocalData.java index 59318cc819e..232cfc67ab1 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/admin/monitor/callflow/ThreadLocalData.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/admin/monitor/callflow/ThreadLocalData.java @@ -23,9 +23,6 @@ package com.sun.enterprise.admin.monitor.callflow; -import java.util.List; -import java.util.Map; - /** * This interface provides access to the thread local call flow data. * diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/NameValue.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/NameValue.java index 723b0a88bb6..e386a1e0a6f 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/NameValue.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/NameValue.java @@ -16,8 +16,6 @@ package com.sun.enterprise.universal; -import java.util.*; - /** * This class is needed so often in so many places. It is centralized once and * for all here. diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/NanoDuration.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/NanoDuration.java index d6c19f2cc32..a60fb864808 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/NanoDuration.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/NanoDuration.java @@ -16,8 +16,6 @@ package com.sun.enterprise.universal; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; - /** * Convert a nanosec duration into something readable * @author bnevins diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystem.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystem.java index cbc8a3b7f9c..5fbc1d04358 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystem.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/glassfish/GFSystem.java @@ -16,7 +16,6 @@ package com.sun.enterprise.universal.glassfish; -import com.sun.enterprise.universal.collections.CollectionUtils; import java.util.*; /** diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessStreamDrainer.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessStreamDrainer.java index ca9db699c94..ef305327d81 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessStreamDrainer.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessStreamDrainer.java @@ -23,9 +23,6 @@ package com.sun.enterprise.universal.process; -import java.io.*; -import java.util.*; - /** * If you don't drain a process' stdout and stderr it will cause a deadlock after a few hundred bytes of output. * At that point the Process is blocked because its stdout and/or stderr buffer is full and it is waiting for the Java caller diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/BeanUtils.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/BeanUtils.java index 3664217f41d..6ac7d9f26c3 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/BeanUtils.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/BeanUtils.java @@ -22,8 +22,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; /** Static methods which are handy to manipulate java beans * diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/Environment.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/Environment.java index db46b00a4b9..b78e2217f38 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/Environment.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/Environment.java @@ -16,9 +16,6 @@ package com.sun.enterprise.util; -import java.util.logging.*; -import com.sun.logging.*; - /** * Environment class that contains information about diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ExceptionUtil.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ExceptionUtil.java index c3a679a6ce9..a99b355aa50 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ExceptionUtil.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/ExceptionUtil.java @@ -17,9 +17,6 @@ package com.sun.enterprise.util; import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.Set; /** * Useful utilities for Exceptions diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/FelixPrettyPrinter.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/FelixPrettyPrinter.java index 35278bdb96a..f9774511563 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/FelixPrettyPrinter.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/FelixPrettyPrinter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Contributors to the Eclipse Foundation + * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation * Copyright (c) 2008, 2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -35,7 +35,7 @@ public class FelixPrettyPrinter { private static final Pattern BUNDLE_PATTERN = Pattern.compile("\\[(\\d+)\\]", Pattern.MULTILINE); public static void main(String[] args) { - System.out.println(prettyPrintExceptionMessage("Unable to resolve org.glassfish.main.webservices.connector [220](R 220.0): missing requirement [org.glassfish.main.webservices.connector [220](R 220.0)] osgi.wiring.package; (&(osgi.wiring.package=org.glassfish.web.deployment.descriptor)(version>=7.0.0)(!(version>=8.0.0))) [caused by: Unable to resolve org.glassfish.main.web.glue [124](R 124.0): missing requirement [org.glassfish.main.web.glue [124](R 124.0)] osgi.wiring.package; (&(osgi.wiring.package=com.sun.web.security)(version>=7.0.0)(!(version>=8.0.0))) [caused by: Unable to resolve org.glassfish.main.security.websecurity [229](R 229.0): missing requirement [org.glassfish.main.security.websecurity [229](R 229.0)] osgi.wiring.package; (&(osgi.wiring.package=org.apache.catalina.realm)(version>=7.0.0)(!(version>=8.0.0))) [caused by: Unable to resolve org.glassfish.main.web.core [36](R 36.0): missing requirement [org.glassfish.main.web.core [36](R 36.0)] osgi.wiring.package; (&(osgi.wiring.package=org.hibernate.validator.cdi)(version>=8.0.0)(!(version>=9.0.0))) [caused by: Unable to resolve org.hibernate.validator.cdi [97](R 97.0): missing requirement [org.hibernate.validator.cdi [97](R 97.0)] osgi.wiring.host; (&(osgi.wiring.host=org.hibernate.validator)(bundle-version>=0.0.0))]]]] Unresolved requirements: [[org.glassfish.main.webservices.connector [220](R 220.0)] osgi.wiring.package; (&(osgi.wiring.package=org.glassfish.web.deployment.descriptor)(version>=7.0.0)(!(version>=8.0.0)))]")); + System.out.println(prettyPrintExceptionMessage("Unable to resolve org.glassfish.main.concurrent.impl [138](R 138.0): missing requirement [org.glassfish.main.concurrent.impl [138](R 138.0)] osgi.wiring.package; (&(osgi.wiring.package=org.glassfish.enterprise.concurrent.spi)(version>=2.0.0)(!(version>=3.0.0))) [caused by: Unable to resolve org.glassfish.jakarta.enterprise.concurrent [190](R 190.0): missing requirement [org.glassfish.jakarta.enterprise.concurrent [190](R 190.0)] osgi.wiring.package; (&(osgi.wiring.package=jakarta.annotation)(version>=2.1.0)(!(version>=3.0.0)))] Unresolved requirements: [[org.glassfish.main.concurrent.impl [138](R 138.0)] osgi.wiring.package; (&(osgi.wiring.package=org.glassfish.enterprise.concurrent.spi)(version>=2.0.0)(!(version>=3.0.0)))]")); } /** diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileListerRelative.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileListerRelative.java index 689764f4a00..f52191edc51 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileListerRelative.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/io/FileListerRelative.java @@ -22,7 +22,6 @@ package com.sun.enterprise.util.io; import java.io.*; -import java.util.*; /** * diff --git a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/MapInjectionResolver.java b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/MapInjectionResolver.java index 1fea8a161aa..ed3e1fca33b 100644 --- a/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/MapInjectionResolver.java +++ b/nucleus/common/common-util/src/main/java/org/glassfish/common/util/admin/MapInjectionResolver.java @@ -29,7 +29,6 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.validation.Validator; import org.glassfish.api.ExecutionContext; import org.glassfish.api.Param; import org.glassfish.api.ParamDefaultCalculator; diff --git a/nucleus/common/common-util/src/test/java/com/sun/enterprise/util/io/FileUtilsTest.java b/nucleus/common/common-util/src/test/java/com/sun/enterprise/util/io/FileUtilsTest.java index 48209c91e7e..aa65d48077a 100644 --- a/nucleus/common/common-util/src/test/java/com/sun/enterprise/util/io/FileUtilsTest.java +++ b/nucleus/common/common-util/src/test/java/com/sun/enterprise/util/io/FileUtilsTest.java @@ -32,7 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.DynamicTest.stream; /** * @author wnevins diff --git a/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/FileLockTest.java b/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/FileLockTest.java index 02ca02b0d12..d628068a4ea 100644 --- a/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/FileLockTest.java +++ b/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/FileLockTest.java @@ -49,7 +49,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Tests for ManagedFile.writeLock and ManagedFile.readLock. diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ApplicationInfoProvider.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ApplicationInfoProvider.java index e4cc2278303..323ed97baf7 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ApplicationInfoProvider.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/ApplicationInfoProvider.java @@ -20,9 +20,6 @@ import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.DeploymentContext; -import java.net.URL; -import java.util.List; - @Contract public interface ApplicationInfoProvider { diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentTracing.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentTracing.java index 43a3cbc43af..788ddad68d9 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentTracing.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentTracing.java @@ -23,7 +23,6 @@ import java.io.PrintStream; import java.util.ArrayList; import java.util.List; -import java.util.Stack; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentType.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentType.java index 60f80fb80e7..b9df05b290e 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentType.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/DeploymentType.java @@ -18,9 +18,7 @@ import java.util.Comparator; -import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.ServerTags; -import org.glassfish.api.admin.config.ApplicationName; /** * DeploymentType defines the various deployment entity types, diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericDeployer.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericDeployer.java index 05f35e1fc9a..b0efa12df29 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericDeployer.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/deployment/GenericDeployer.java @@ -19,7 +19,6 @@ import org.glassfish.api.deployment.*; import org.glassfish.api.container.Container; import org.jvnet.hk2.annotations.Service; -import com.sun.enterprise.module.HK2Module; /** * Generic implementation of the deployer contract, enough to get started with adding a container to diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ConnectorStarter.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ConnectorStarter.java index 4274b1b45f2..3c2a5b5627d 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ConnectorStarter.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/ConnectorStarter.java @@ -16,7 +16,6 @@ package org.glassfish.admin.mbeanserver; -import org.glassfish.grizzly.config.dom.Ssl; import org.glassfish.hk2.api.ServiceLocator; import javax.management.MBeanServer; @@ -25,7 +24,6 @@ import javax.management.remote.JMXServiceURL; import javax.security.auth.Subject; import java.io.IOException; -import java.net.InetAddress; import java.net.UnknownHostException; /** diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXSslConfigHolder.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXSslConfigHolder.java index b9d10f8f29c..fb863c6fdf9 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXSslConfigHolder.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXSslConfigHolder.java @@ -17,18 +17,9 @@ package org.glassfish.admin.mbeanserver; import org.glassfish.grizzly.config.dom.Ssl; -import java.io.IOException; -import java.net.InetAddress; -import java.net.Socket; -import java.net.UnknownHostException; -import javax.net.ssl.KeyManager; -import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.X509KeyManager; import org.glassfish.grizzly.config.SSLConfigurator; import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.api.Globals; /** * This class extends the SSLConfigHolder for the sole purpose of diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java index 7de90a223a4..bf540036bb3 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/JMXStartupService.java @@ -62,8 +62,6 @@ import org.glassfish.internal.api.PostStartupRunLevel; import org.glassfish.logging.annotation.LogMessageInfo; -import org.glassfish.logging.annotation.LoggerInfo; -import org.glassfish.logging.annotation.LogMessagesResourceBundle; /** * Responsible for creating the {@link BootAMXMBean}, and starting JMXConnectors, diff --git a/nucleus/common/scattered-archive-api/src/test/java/org/glassfish/embeddable/archive/ScatteredArchiveTest.java b/nucleus/common/scattered-archive-api/src/test/java/org/glassfish/embeddable/archive/ScatteredArchiveTest.java index dec126f8290..5d67fcb7eca 100644 --- a/nucleus/common/scattered-archive-api/src/test/java/org/glassfish/embeddable/archive/ScatteredArchiveTest.java +++ b/nucleus/common/scattered-archive-api/src/test/java/org/glassfish/embeddable/archive/ScatteredArchiveTest.java @@ -11,7 +11,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.hamcrest.Matchers; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; diff --git a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/MinimalBundleProvisioner.java b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/MinimalBundleProvisioner.java index 78e7bdce966..8d3c0b50abf 100644 --- a/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/MinimalBundleProvisioner.java +++ b/nucleus/core/bootstrap/src/main/java/com/sun/enterprise/glassfish/bootstrap/osgi/MinimalBundleProvisioner.java @@ -24,7 +24,6 @@ import java.io.InputStream; import java.net.URI; import java.util.*; -import java.util.jar.JarFile; import java.util.jar.JarInputStream; import java.util.jar.Manifest; import java.util.logging.Level; diff --git a/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/MainHelperTest.java b/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/MainHelperTest.java index be59cf8815d..e5453d12379 100644 --- a/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/MainHelperTest.java +++ b/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/MainHelperTest.java @@ -27,7 +27,6 @@ import java.nio.file.Path; import java.util.Properties; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import static com.sun.enterprise.glassfish.bootstrap.Constants.INSTALL_ROOT_PROP_NAME; diff --git a/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/osgi/BundleProvisionerTest.java b/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/osgi/BundleProvisionerTest.java index 4dc8b63c931..07ac0c69144 100644 --- a/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/osgi/BundleProvisionerTest.java +++ b/nucleus/core/bootstrap/src/test/java/com/sun/enterprise/glassfish/bootstrap/osgi/BundleProvisionerTest.java @@ -33,8 +33,6 @@ import org.osgi.framework.launch.Framework; import org.osgi.framework.launch.FrameworkFactory; -import static com.sun.enterprise.glassfish.bootstrap.Constants.INSTALL_ROOT_PROP_NAME; -import static com.sun.enterprise.glassfish.bootstrap.Constants.INSTANCE_ROOT_PROP_NAME; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/ContextMapPropagatorTest.java b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/ContextMapPropagatorTest.java index 9034e7facd1..e876a1d45ec 100644 --- a/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/ContextMapPropagatorTest.java +++ b/nucleus/core/context-propagation/src/test/java/org/glassfish/contextpropagation/internal/ContextMapPropagatorTest.java @@ -36,7 +36,6 @@ import org.glassfish.contextpropagation.wireadapters.WireAdapter; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java index e9b7c07bc5f..e5f19746aca 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/CommandRunnerImpl.java @@ -116,7 +116,6 @@ import com.sun.enterprise.util.AnnotationUtil; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.util.Utility; import com.sun.enterprise.v3.common.XMLContentActionReporter; import jakarta.inject.Inject; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java index 9a9f64848c3..2a123f4a112 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/JobManagerService.java @@ -23,7 +23,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; import java.util.Iterator; import java.util.Locale; import java.util.Set; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java index 6ccbac0753e..81ad0c102c7 100755 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/SupplementalCommandExecutorImpl.java @@ -26,7 +26,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -63,8 +62,6 @@ import org.jvnet.hk2.config.InjectionResolver; import com.sun.enterprise.util.LocalStringManagerImpl; -import com.sun.enterprise.util.Utility; - import jakarta.inject.Inject; /** diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java index d2294680454..b67c23d205a 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/CreateThreadpool.java @@ -18,7 +18,6 @@ import java.beans.PropertyVetoException; -import org.glassfish.internal.api.Target; import com.sun.enterprise.config.serverbeans.*; import org.glassfish.api.admin.*; import org.glassfish.api.I18n; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java index ba2f0615e9d..950ef729956 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/DeleteThreadpool.java @@ -19,7 +19,6 @@ import java.beans.PropertyVetoException; import java.util.List; -import org.glassfish.internal.api.Target; import com.sun.enterprise.config.serverbeans.*; import org.glassfish.api.admin.*; import org.glassfish.api.I18n; @@ -41,7 +40,6 @@ import org.glassfish.grizzly.config.dom.ThreadPool; import org.glassfish.grizzly.config.dom.NetworkListener; -import org.glassfish.grizzly.config.dom.Protocol; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; import org.glassfish.api.ActionReport.ExitCode; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java index c265b6651d7..3501f5dac69 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/admin/commands/ListThreadpools.java @@ -32,7 +32,6 @@ import org.glassfish.api.admin.ServerEnvironment; import org.glassfish.config.support.CommandTarget; import org.glassfish.config.support.TargetType; -import org.glassfish.internal.api.Target; import jakarta.inject.Inject; import jakarta.inject.Named; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java index b056119bfdd..a3b1b5f95c5 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/DynamicReloadService.java @@ -22,7 +22,6 @@ import java.beans.PropertyChangeEvent; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Timer; import java.util.TimerTask; diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ADBAwareHttpHandler.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ADBAwareHttpHandler.java index 2b0e1e69391..80258eb3306 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ADBAwareHttpHandler.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ADBAwareHttpHandler.java @@ -32,8 +32,6 @@ import org.glassfish.grizzly.http.util.Header; import org.glassfish.grizzly.http.util.HttpStatus; -import static org.glassfish.grizzly.http.server.StaticHttpHandlerBase.sendFile; - /** * {@link StaticHttpHandler}, which additionally can check registered * {@link AlternateDocBase}s to serve requested resources. diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ServiceInitializerListener.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ServiceInitializerListener.java index e04237d3038..5a552f9eeac 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ServiceInitializerListener.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/ServiceInitializerListener.java @@ -25,8 +25,6 @@ import org.glassfish.grizzly.filterchain.FilterChainBuilder; import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder; import org.glassfish.grizzly.strategies.SameThreadIOStrategy; -import org.glassfish.grizzly.threadpool.GrizzlyExecutorService; -import org.glassfish.grizzly.threadpool.ThreadPoolConfig; import org.glassfish.hk2.api.ServiceLocator; /** diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/ConnectionQueueStatsProvider.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/ConnectionQueueStatsProvider.java index 44f0561d598..a9234bbe47c 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/ConnectionQueueStatsProvider.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/monitor/stats/ConnectionQueueStatsProvider.java @@ -28,7 +28,6 @@ import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.gmbal.ManagedObject; -import org.glassfish.grizzly.threadpool.SyncThreadPool; import org.glassfish.grizzly.threadpool.ThreadPoolConfig; /** diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java index 88b843a4b7b..8535e22e78f 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/EmbeddedAdminCtrImpl.java @@ -30,8 +30,6 @@ import java.util.List; import java.util.ArrayList; -import java.util.Properties; - import com.sun.enterprise.v3.common.PlainTextActionReporter; import org.glassfish.internal.api.InternalSystemAdministrator; diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java index fee4ece8fa0..d3548b23ec1 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java @@ -21,15 +21,11 @@ import com.sun.enterprise.config.serverbeans.HttpService; import com.sun.enterprise.config.serverbeans.VirtualServer; -import org.glassfish.grizzly.config.dom.Http; import org.glassfish.grizzly.config.dom.NetworkConfig; import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.config.dom.NetworkListeners; import org.glassfish.grizzly.config.dom.Protocol; import org.glassfish.grizzly.config.dom.Protocols; -import org.glassfish.grizzly.config.dom.ThreadPool; -import org.glassfish.grizzly.config.dom.Transport; -import org.glassfish.grizzly.config.dom.Transports; import org.glassfish.api.ActionReport; import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.ServerEnvironment; diff --git a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java index d1ff3a35ac1..0fd0a44daec 100644 --- a/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java +++ b/nucleus/core/logging/src/main/java/com/sun/enterprise/server/logging/commands/ListLogAttributes.java @@ -42,11 +42,8 @@ import org.jvnet.hk2.annotations.Service; import com.sun.common.util.logging.LoggingConfigImpl; -import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Clusters; -import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.Servers; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.SystemPropertyConstants; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java index 84bf1abff03..33dc0da284d 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/AddLibraryCommand.java @@ -26,8 +26,6 @@ import org.glassfish.api.Param; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; import org.glassfish.internal.config.UnprocessedConfigListener; import org.jvnet.hk2.config.UnprocessedChangeEvent; import org.jvnet.hk2.config.UnprocessedChangeEvents; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java index a12a85fadea..fc8e622ca84 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateApplicationRefCommand.java @@ -28,7 +28,6 @@ import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.event.Events; import org.glassfish.api.event.EventListener.Event; -import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.DeployCommandParameters; import org.glassfish.api.deployment.OpsParams.Origin; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java index c528dbfbf70..40b3002079f 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/CreateLifecycleModuleCommand.java @@ -51,7 +51,6 @@ import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestParam; import org.glassfish.api.admin.RuntimeType; -import org.glassfish.deployment.common.DeploymentUtils; /** * Create lifecycle modules. diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java index e6336902973..ee56cffbdd8 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeleteApplicationRefCommand.java @@ -22,7 +22,6 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; -import java.util.ArrayList; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.Param; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployDirCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployDirCommand.java index 8a79c58c37f..ff5378b3572 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployDirCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeployDirCommand.java @@ -16,7 +16,6 @@ package org.glassfish.deployment.admin; -import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.api.ActionReport; import org.glassfish.api.I18n; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java index 09a958fa5ca..314d42140d9 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/DeploymentCommandUtils.java @@ -24,7 +24,6 @@ import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Domain; -import com.sun.enterprise.config.serverbeans.Server; import java.util.Collection; import java.util.Collections; import java.util.logging.Logger; @@ -44,10 +43,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import org.glassfish.api.admin.AccessRequired; -import org.glassfish.deployment.common.DeploymentUtils; import org.jvnet.hk2.config.ConfigBeanProxy; /** diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java index 23cf529e14e..507532e8ffb 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetClientStubsCommand.java @@ -35,7 +35,6 @@ import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; -import org.glassfish.hk2.api.PostConstruct; /** * diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java index b40435f5628..76c29faf6b5 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java @@ -26,8 +26,6 @@ import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; import org.jvnet.hk2.annotations.Service; import org.glassfish.hk2.api.PerLookup; @@ -36,9 +34,6 @@ import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.config.serverbeans.Domain; -import java.util.logging.Logger; -import java.util.logging.Level; -import java.util.List; import java.io.File; import org.glassfish.api.admin.AccessRequired; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java index 287de02f621..b27b52eebcc 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLifecycleModulesCommand.java @@ -21,9 +21,6 @@ import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.config.serverbeans.Domain; import com.sun.enterprise.config.serverbeans.Server; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.I18n; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java index ab0f4e97b79..95b327ae415 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/MTUnprovisionCommand.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.Properties; import java.util.logging.Logger; import java.util.logging.Level; import java.net.URI; @@ -32,7 +31,6 @@ import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.deployment.DeployCommandParameters; -import org.glassfish.api.deployment.DeploymentContext; import org.glassfish.api.deployment.archive.ReadableArchive; import org.glassfish.api.deployment.UndeployCommandParameters; import org.glassfish.internal.data.ApplicationInfo; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java index 02729e1a5a0..b1e195542f7 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/PostStateCommand.java @@ -24,7 +24,6 @@ import org.glassfish.api.admin.AdminCommandContext; import org.glassfish.hk2.api.PerLookup; import org.glassfish.hk2.api.ServiceLocator; -import org.glassfish.internal.deployment.ApplicationLifecycleInterceptor; import org.glassfish.internal.deployment.ExtendedDeploymentContext; import jakarta.inject.Inject; import org.glassfish.api.admin.AccessRequired.AccessCheck; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java index e4e8f25cd4f..3ed7960dcf7 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ReDeployCommand.java @@ -36,7 +36,6 @@ import jakarta.inject.Inject; import org.glassfish.hk2.api.PerLookup; -import java.util.Properties; import java.util.Collection; import java.util.ArrayList; import java.io.File; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java index e586adc305d..d5a2592a6b1 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/RemoveLibraryCommand.java @@ -26,8 +26,6 @@ import org.glassfish.api.admin.RuntimeType; import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RestEndpoint; -import org.glassfish.config.support.TargetType; -import org.glassfish.config.support.CommandTarget; import org.glassfish.internal.config.UnprocessedConfigListener; import org.jvnet.hk2.config.UnprocessedChangeEvent; import org.jvnet.hk2.config.UnprocessedChangeEvents; diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployDirectoryScanner.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployDirectoryScanner.java index 5d4176be0fa..89def6f3fbb 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployDirectoryScanner.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployDirectoryScanner.java @@ -30,8 +30,6 @@ import java.util.logging.Logger; import java.util.logging.LogRecord; import java.util.logging.Level; -import org.glassfish.deployment.common.DeploymentUtils; - import org.glassfish.logging.annotation.LogMessageInfo; /** diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java index 243cc8e7804..5f54644b8c9 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployService.java @@ -30,7 +30,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.glassfish.api.admin.ServerEnvironment; -import org.glassfish.deployment.common.DeploymentUtils; import org.glassfish.hk2.runlevel.RunLevel; import org.glassfish.internal.api.PostStartupRunLevel; import jakarta.inject.Inject; @@ -40,7 +39,6 @@ import org.glassfish.hk2.api.PreDestroy; import org.glassfish.hk2.api.ServiceLocator; -import jakarta.inject.Singleton; import org.jvnet.hk2.config.ConfigListener; import org.jvnet.hk2.config.UnprocessedChangeEvent; import org.jvnet.hk2.config.UnprocessedChangeEvents; diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployedFilesManager.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployedFilesManager.java index 46d07ddbd0e..4801a957e1c 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployedFilesManager.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployedFilesManager.java @@ -28,8 +28,6 @@ import java.util.*; import java.util.logging.Logger; import java.util.logging.Level; -import org.glassfish.deployment.common.DeploymentUtils; - import org.glassfish.logging.annotation.LogMessageInfo; /** diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java index d9a8f50025a..508f42bf664 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoOperation.java @@ -27,7 +27,6 @@ import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.ParameterMap; import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus; -import org.glassfish.deployment.common.DeploymentUtils; import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java index 3a48e8e5dc2..3cd79538920 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutodeployRetryManager.java @@ -25,9 +25,7 @@ import java.util.logging.Logger; import org.glassfish.api.ActionReport; -import org.glassfish.api.Async; import org.glassfish.deployment.autodeploy.AutoDeployer.AutodeploymentStatus; -import org.glassfish.deployment.common.DeploymentUtils; import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; diff --git a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java index 09a4d226b9c..2aa306e5669 100644 --- a/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java +++ b/nucleus/deployment/common/src/main/java/com/sun/enterprise/deployment/deploy/shared/MultiReadableArchive.java @@ -21,13 +21,10 @@ import java.io.IOException; import java.io.InputStream; import java.net.URI; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; -import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.List; import java.util.jar.Manifest; import org.glassfish.api.deployment.archive.ReadableArchive; import jakarta.inject.Inject; diff --git a/nucleus/deployment/common/src/test/java/com/sun/enterprise/deploy/shared/FileArchiveTest.java b/nucleus/deployment/common/src/test/java/com/sun/enterprise/deploy/shared/FileArchiveTest.java index 56b18d5e1a7..f957f51e3d8 100644 --- a/nucleus/deployment/common/src/test/java/com/sun/enterprise/deploy/shared/FileArchiveTest.java +++ b/nucleus/deployment/common/src/test/java/com/sun/enterprise/deploy/shared/FileArchiveTest.java @@ -46,7 +46,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; -import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; import static org.glassfish.deployment.common.DeploymentContextImpl.deplLogger; diff --git a/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextManagerImpl.java b/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextManagerImpl.java index 8f567bd6925..db08528f0ed 100644 --- a/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextManagerImpl.java +++ b/nucleus/diagnostics/context/src/main/java/org/glassfish/diagnostics/context/impl/ContextManagerImpl.java @@ -30,7 +30,6 @@ import java.util.Set; import java.util.logging.Level; -import java.util.logging.Logger; /** diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightUtils.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightUtils.java index a74af340a77..11e8d91dd33 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightUtils.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/FlashlightUtils.java @@ -29,7 +29,6 @@ import org.glassfish.external.probe.provider.annotations.Probe; import org.glassfish.external.probe.provider.annotations.ProbeParam; import org.glassfish.flashlight.impl.core.FlashlightProbeProvider; -import org.glassfish.flashlight.provider.FlashlightProbe; import org.glassfish.hk2.api.ServiceLocator; /** diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java index 4e9f871dc6f..558076b8807 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/EnableMonitoring.java @@ -32,7 +32,6 @@ import org.glassfish.hk2.api.PerLookup; import com.sun.enterprise.util.LocalStringManagerImpl; -import java.io.File; import com.sun.enterprise.config.serverbeans.MonitoringService; import jakarta.inject.Inject; diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/MonitoringConfig.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/MonitoringConfig.java index 2a3e88b3fa5..845e6cd3de6 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/MonitoringConfig.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/cli/MonitoringConfig.java @@ -18,8 +18,6 @@ import com.sun.enterprise.config.serverbeans.ModuleMonitoringLevels; import org.glassfish.api.ActionReport; -import org.glassfish.api.I18n; -import org.glassfish.api.Param; import org.jvnet.hk2.annotations.Service; import com.sun.enterprise.util.LocalStringManagerImpl; import java.beans.PropertyVetoException; @@ -28,7 +26,6 @@ import org.jvnet.hk2.config.ConfigSupport; import com.sun.enterprise.config.serverbeans.MonitoringService; import org.glassfish.api.monitoring.ContainerMonitoring; -import org.jvnet.hk2.config.ConfigBean; import org.jvnet.hk2.config.Dom; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/DTraceClientInvoker.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/DTraceClientInvoker.java index 3f721361b25..d64b70dd6b6 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/DTraceClientInvoker.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/client/DTraceClientInvoker.java @@ -22,12 +22,10 @@ package org.glassfish.flashlight.impl.client; import java.lang.reflect.Method; -import java.util.*; import java.util.logging.*; import org.glassfish.flashlight.FlashlightUtils; import org.glassfish.flashlight.client.ProbeClientInvoker; import org.glassfish.flashlight.provider.FlashlightProbe; -import com.sun.enterprise.util.LocalStringManagerImpl; import org.glassfish.flashlight.FlashlightLoggerInfo; /** diff --git a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java index 4617fbfc3ba..77cb530b16a 100644 --- a/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java +++ b/nucleus/flashlight/framework/src/main/java/org/glassfish/flashlight/impl/provider/FlashlightProbeProviderFactory.java @@ -40,8 +40,6 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import java.text.MessageFormat; - import org.glassfish.hk2.api.PostConstruct; import org.glassfish.hk2.api.ServiceLocator; diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java index db042f9895f..f3c74847bd1 100644 --- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java +++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java @@ -78,8 +78,13 @@ public SSLConfigurator(final ServiceLocator serviceLocator, final Ssl ssl) { sslImplementation = sslImplementationLocal; - setNeedClientAuth(isNeedClientAuth(ssl)); - setWantClientAuth(isWantClientAuth(ssl)); + if (isWantClientAuth(ssl)) { + setWantClientAuth(true); + } + + if (isNeedClientAuth(ssl)) { + setNeedClientAuth(true); + } clientMode = false; sslContextConfiguration = new InternalSSLContextConfigurator(); diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/ServerSocketFactory.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/ServerSocketFactory.java index b1ea245d226..3c29e0c2445 100644 --- a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/ServerSocketFactory.java +++ b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/ssl/ServerSocketFactory.java @@ -22,7 +22,6 @@ import java.net.ServerSocket; import java.net.Socket; import java.util.HashMap; -import java.util.Hashtable; import java.util.Map; import javax.net.ssl.SSLContext; diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConstrainedBeanListener.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConstrainedBeanListener.java index 763758f4c5d..622de0f7151 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConstrainedBeanListener.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/ConstrainedBeanListener.java @@ -17,7 +17,6 @@ package org.jvnet.hk2.config; -import java.beans.PropertyChangeListener; import java.beans.VetoableChangeListener; /** diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/DomProxyCreator.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/DomProxyCreator.java index deb73585f8b..5cbc61c043e 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/DomProxyCreator.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/DomProxyCreator.java @@ -19,10 +19,6 @@ import org.jvnet.hk2.config.provider.internal.Creator; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - /** * {@link org.jvnet.hk2.component.Creator} that returns a typed proxy to {@link Dom}. * diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionTarget.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionTarget.java index 154c041fcd0..c131dc7751f 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionTarget.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/InjectionTarget.java @@ -25,7 +25,6 @@ import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** diff --git a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/PrimitiveDataType.java b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/PrimitiveDataType.java index 654762302e4..cfa922f6d15 100644 --- a/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/PrimitiveDataType.java +++ b/nucleus/hk2-config-generator/src/main/java/org/jvnet/hk2/config/PrimitiveDataType.java @@ -17,8 +17,6 @@ package org.jvnet.hk2.config; -import org.jvnet.hk2.annotations.Service; - /** Represents a Java primitive (and its wrapper) data type. Not all Java primitives * are relevant from a configuration standpoint. * @see DataType diff --git a/nucleus/osgi-platforms/osgi-cli-interactive/src/main/java/org/glassfish/osgi/cli/interactive/LocalOSGiShellCommand.java b/nucleus/osgi-platforms/osgi-cli-interactive/src/main/java/org/glassfish/osgi/cli/interactive/LocalOSGiShellCommand.java index 56509da5262..20c8338e187 100644 --- a/nucleus/osgi-platforms/osgi-cli-interactive/src/main/java/org/glassfish/osgi/cli/interactive/LocalOSGiShellCommand.java +++ b/nucleus/osgi-platforms/osgi-cli-interactive/src/main/java/org/glassfish/osgi/cli/interactive/LocalOSGiShellCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation + * Copyright (c) 2022, 2024 Contributors to the Eclipse Foundation. * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the @@ -31,11 +31,9 @@ import jakarta.inject.Inject; import java.io.File; -import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -64,6 +62,7 @@ import org.jline.reader.impl.completer.StringsCompleter; import org.jline.terminal.Terminal; import org.jline.terminal.TerminalBuilder; +import org.jline.terminal.impl.ExternalTerminal; import org.jvnet.hk2.annotations.Service; import static org.glassfish.hk2.utilities.BuilderHelper.createConstantDescriptor; @@ -173,9 +172,12 @@ protected int executeCommand() throws CommandException { logger.log(Level.FINEST, "executeCommand: args {0}", Arrays.toString(args)); shellType = cmd.executeAndReturnOutput(args).trim(); try (Terminal terminal = createTerminal()) { - LineReader reader = LineReaderBuilder.builder().completer(getCommandCompleter()).appName(REMOTE_COMMAND) - .terminal(terminal).build(); - return executeCommands(reader); + LineReaderBuilder builder = LineReaderBuilder.builder().appName(REMOTE_COMMAND).terminal(terminal); + if (isInteractive()) { + builder.completer(getCommandCompleter()); + builder.option(LineReader.Option.INSERT_TAB, false); + } + return executeCommands(builder.build()); } catch (IOException e) { throw new CommandException(e); } @@ -195,29 +197,20 @@ private String[] enhanceForTarget(String[] args) { private Terminal createTerminal() throws IOException, CommandException { - InputStream inputStream; - OutputStream outputStream; - if (file != null) { + if (!isInteractive()) { if (!file.canRead()) { throw new CommandException("File: " + file + " can not be read"); } - inputStream = new FileInputStream(file); - outputStream = new EmptyOutputStream(); - } else { - System.out.println(STRINGS.get("multimodeIntro")); - inputStream = new FileInputStream(FileDescriptor.in); - outputStream = System.out; - } - TerminalBuilder builder = TerminalBuilder.builder().streams(inputStream, outputStream); + Charset charset = encoding == null ? Charset.defaultCharset() : Charset.forName(encoding); - if (System.getenv("TERM") == null) { - Terminal terminal = builder.type("dumb").build(); - terminal.echo(false); - return terminal; + return new ExternalTerminal(REMOTE_COMMAND, "dumb", + new FileInputStream(file), new EmptyOutputStream(), charset); } - return builder.build(); + System.out.println(STRINGS.get("multimodeIntro")); + + return TerminalBuilder.builder().system(true).build(); } @@ -321,7 +314,7 @@ private int executeCommands(LineReader reader) throws CommandException { try { while (true) { try { - if (isPromptPrinted()) { + if (isInteractive()) { line = reader.readLine(shellType + "$ "); } else { line = reader.readLine(); @@ -436,7 +429,7 @@ private int stopSession(String sessionId) throws CommandException { } - private boolean isPromptPrinted() { + private boolean isInteractive() { return file == null; } diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index db3489a2849..bc8ded2a27e 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -1,7 +1,7 @@ - 6.0.0-M2 + 6.0.0 6.0.0-M1 - 6.1.0-M1 + 6.1.0-M2 3.1.0-M1 @@ -83,7 +83,7 @@ - 4.0.1 + 4.0.2 2.0.1.MR - 4.0.0-M1.1 - 4.0.0-M1.1 + 4.0.0-M2 + 4.0.0-M2 - 4.0.1 - 4.0.4 + 4.0.2 + 4.0.5 3.1.0 4.0-M1-GF1 - 2.1.2 - 2.0.2 + 2.1.3 + 2.0.3 - 2.1.2 - 2.0.1 + 2.1.3 + 2.0.2 - 3.0.0-M1 - - 4.0.0-M1 - 3.0.0-M1 - 3.1.0-M1 + 3.0.0 @@ -140,11 +136,11 @@ 3.5.3.Final 3.30.2-GA 9.6 - 0.2.16 + 0.2.17 2.7.8 - 1.10.12 + 1.10.14 1.10.2 - 2.16.1 + 2.17.0-rc1 1.7.0 1.0-2 1.5.4 @@ -339,29 +335,7 @@ ${jakarta.annotation-api.version} - - - jakarta.security.enterprise - jakarta.security.enterprise-api - ${jakarta.security-api.version} - - - jakarta.authentication - jakarta.authentication-api - ${jakarta.authentication-api.version} - - - jakarta.authorization - jakarta.authorization-api - ${jakarta.authorization-api.version} - - - jakarta.servlet - jakarta.servlet-api - - - - + @@ -450,7 +424,7 @@ org.jboss.shrinkwrap.resolver shrinkwrap-resolver-impl-maven-archive - 3.2.1 + 3.3.0 test @@ -513,7 +487,7 @@ org.apache.felix org.apache.felix.webconsole - 4.8.12 + 5.0.0 org.apache.felix @@ -576,7 +550,7 @@ org.jline jline - 3.25.0 + 3.25.1 @@ -797,7 +771,7 @@ maven-compiler-plugin - 3.11.0 + 3.12.1 21 21 @@ -844,7 +818,7 @@ maven-javadoc-plugin - 3.6.0 + 3.6.3 false false @@ -857,11 +831,11 @@ maven-clean-plugin - 3.3.1 + 3.3.2 maven-surefire-plugin - 3.2.2 + 3.2.5 en @@ -884,7 +858,7 @@ maven-failsafe-plugin - 3.2.2 + 3.2.5 en @@ -920,11 +894,11 @@ maven-surefire-report-plugin - 3.2.2 + 3.2.5 maven-checkstyle-plugin - 3.3.0 + 3.3.1 org/glassfish/qa/config/checkstyle/checkstyle.xml org/glassfish/qa/config/checkstyle/checkstyle-suppressions.xml @@ -950,7 +924,7 @@ com.puppycrawl.tools checkstyle - 10.12.4 + 10.14.1 @@ -971,7 +945,7 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.7.1 + 1.8.1 maven-release-plugin @@ -983,12 +957,12 @@ maven-site-plugin - 4.0.0-M9 + 4.0.0-M13 org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.2.0 ${java.home} @@ -1015,7 +989,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.4.0 + 3.5.0 maven-invoker-plugin diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java index ecc90889c58..f7abda4fdc9 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/SecurityServicesUtil.java @@ -14,10 +14,6 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 */ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package com.sun.enterprise.security; import com.sun.enterprise.security.audit.AuditManager; diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java index ad01e8c7ce5..cb3c8a872ee 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/UsernamePasswordStore.java @@ -17,8 +17,6 @@ package com.sun.enterprise.security; import java.util.Arrays; -import java.util.logging.Logger; - import com.sun.enterprise.security.common.ClientSecurityContext; /** diff --git a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java index 054f0cce363..b4007908897 100644 --- a/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java +++ b/nucleus/security/core/src/main/java/com/sun/enterprise/security/auth/realm/ldap/LDAPRealm.java @@ -27,7 +27,6 @@ import static javax.naming.Context.SECURITY_PRINCIPAL; import static javax.naming.directory.SearchControls.SUBTREE_SCOPE; -import com.sun.enterprise.security.auth.realm.GlassFishUserStore; import com.sun.enterprise.security.auth.realm.Realm; import com.sun.enterprise.security.auth.realm.exceptions.BadRealmException; import com.sun.enterprise.security.auth.realm.exceptions.InvalidOperationException; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java index 5d2b28cf959..1b26ee9519f 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/commands/LDAPAdminAccessConfigurator.java @@ -24,7 +24,6 @@ import com.sun.enterprise.util.StringUtils; import com.sun.enterprise.util.SystemPropertyConstants; import org.glassfish.security.services.impl.ServiceLogging; -import java.beans.PropertyChangeEvent; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; @@ -32,8 +31,6 @@ import org.glassfish.internal.api.Target; import jakarta.inject.Inject; import org.jvnet.hk2.annotations.Service; -import org.jvnet.hk2.config.ConfigSupport; -import org.jvnet.hk2.config.SingleConfigCode; import org.jvnet.hk2.config.TransactionFailure; import org.jvnet.hk2.config.types.Property; diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java index 1a8194566e9..3d696802340 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/common/SecurityScope.java @@ -23,8 +23,6 @@ import java.lang.annotation.Target; import jakarta.inject.Scope; -import org.glassfish.hk2.api.Proxiable; - /** * Scope used by security services that enables a flexible binding to service instances. */ diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSPasswordAliasStore.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSPasswordAliasStore.java index a495afe022f..215775ca61f 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSPasswordAliasStore.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSPasswordAliasStore.java @@ -18,15 +18,10 @@ import com.sun.enterprise.security.store.PasswordAdapter; import com.sun.enterprise.util.Utility; -import java.io.IOException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.charset.Charset; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; diff --git a/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml b/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml index ba500ba8986..66e742850d0 100644 --- a/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml +++ b/qa/src/main/resources/org/glassfish/qa/config/checkstyle/checkstyle.xml @@ -83,6 +83,7 @@ +