Merge pull request #24856 from arjantijms/8.0

Merge latest 8.0 updates and changes from master
eclipse-ee4j · Mar 14, 2024 · d0d7288 · d0d7288
2 parents 25f04c7 + 30d6d49
commit d0d7288
Show file tree

Hide file tree

Showing 533 changed files with 1,079 additions and 1,461 deletions.
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
@@ -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
@@ -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/...admingui/common/src/main/java/org/glassfish/admingui/common/handlers/LogViewHandlers.java b/...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/...ingui/common/src/main/java/org/glassfish/admingui/common/handlers/MonitoringHandlers.java b/...ingui/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/...dmingui/common/src/main/java/org/glassfish/admingui/common/handlers/ResourceHandlers.java b/...dmingui/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/...dmingui/common/src/main/java/org/glassfish/admingui/common/handlers/RestUtilHandlers.java b/...dmingui/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/...gui/common/src/main/java/org/glassfish/admingui/common/servlet/LogFilesContentSource.java b/...gui/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/...ver/admingui/common/src/main/java/org/glassfish/admingui/common/tree/FilterTreeEvent.java b/...ver/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
@@ -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
@@ -37,8 +37,6 @@
 import java.util.Map;
 import java.util.HashMap;
 
-import java.util.Set;
-
 
 public class JndiHandlers {
 

diff --git a/...i/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetContent.java b/...i/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/...ui/gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModule.java b/...ui/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/...-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetModulePrefs.java b/...-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/.../gf-admingui-connector/src/main/java/org/glassfish/admingui/connector/GadgetUserPref.java b/.../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/...ngui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java b/...ngui/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/...lugin-service/src/main/java/org/glassfish/admingui/plugin/IntegrationPointComparator.java b/...lugin-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;
 
 /**
  *  <p>        This class compares two {@link IntegrationPoint} Objects.  See

diff --git a/...t/client/acc/src/main/java/org/glassfish/appclient/client/acc/ClassFileAppClientInfo.java b/...t/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/...ient/client/acc/src/main/java/org/glassfish/appclient/client/acc/NestedAppClientInfo.java b/...ient/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/...r/core/src/main/java/org/glassfish/appclient/server/core/ApplicationSignedJARManager.java b/...r/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/...core/src/main/java/org/glassfish/appclient/server/core/NestedAppClientDeployerHelper.java b/...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/...rver/core/src/main/java/org/glassfish/appclient/server/core/jws/ClientJNLPConfigData.java b/...rver/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/.../server/core/src/main/java/org/glassfish/appclient/server/core/jws/NamingConventions.java b/.../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/.../core/src/main/java/org/glassfish/appclient/server/core/jws/RestrictedContentAdapter.java b/.../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/...ain/java/org/glassfish/appclient/server/core/jws/XPathToDeveloperProvidedContentRefs.java b/...ain/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/...java/org/glassfish/appclient/server/core/jws/servedcontent/CachingDynamicContentImpl.java b/...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/...ore/src/main/java/org/glassfish/appclient/server/core/jws/servedcontent/FixedContent.java b/...ore/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/.../glassfish-batch-commands/src/main/java/org/glassfish/batch/AbstractListCommandProxy.java b/.../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/...assfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java b/...assfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchJobExecutionsProxy.java
@@ -17,23 +17,16 @@
 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;
-import java.util.logging.Logger;
 
 /**
  * Command to list batch jobs info

diff --git a/...sfish-batch-commands/src/main/java/org/glassfish/batch/ListBatchRuntimeConfiguration.java b/...sfish-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/...batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeConfiguration.java b/...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/...ssfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java b/...ssfish-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/...ch-connector/src/main/java/org/glassfish/batch/spi/impl/GlassFishBatchSecurityHelper.java b/...ch-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/...mmon/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/DASJ2EEServerImpl.java b/...mmon/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/.../common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEDomainImpl.java b/.../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/...-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEManagedObjectImplBase.java b/...-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/...mon/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/J2EEModuleImplBase.java b/...mon/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;
 
 /**