Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge latest 8.0 updates and changes from master #24856

Merged
merged 48 commits into from Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b4d1788
Integrate JLine 3.25.1
avpinchuk Feb 26, 2024
a4845f2
Improve OSGi interactive console
avpinchuk Feb 26, 2024
6a832ee
Integrate HK2 3.1.0
arjantijms Feb 27, 2024
c29db1a
Integrate JSF Templating 4.0.4
arjantijms Feb 27, 2024
fbfd57c
Also update HK2 plugin
arjantijms Feb 27, 2024
d5f0c7b
Extract charset to a separate variable
avpinchuk Feb 27, 2024
67fd653
Merge pull request #24834 from arjantijms/7.0.13-PREPARE
arjantijms Feb 27, 2024
1e1def5
Merge pull request #24830 from avpinchuk/osgi-shell
avpinchuk Feb 28, 2024
5459544
Merge pull request #24831 from avpinchuk/jline_3_25_1
dmatej Feb 28, 2024
5829ac5
Prepare release 7.0.13
glassfish-bot Feb 28, 2024
728774e
Prepare next development cycle for 7.0.14-SNAPSHOT
glassfish-bot Feb 28, 2024
23223e1
Webpage update for 7.0.13
arjantijms Feb 29, 2024
7fb4f30
Merge pull request #24837 from eclipse-ee4j/7.0.13-BRANCH
arjantijms Feb 29, 2024
06a39a9
Fixed date error. It's the 29th today of course.
arjantijms Feb 29, 2024
0ed4ac5
Merge pull request #24838 from arjantijms/website_713
arjantijms Feb 29, 2024
10cc3b7
Merge remote-tracking branch 'origin/master' into 8.0
arjantijms Mar 1, 2024
50eb4dd
Integrate jsch 0.2.17
arjantijms Mar 1, 2024
72dbb58
Integrate Mail API 2.1.3 + dependencies and implementation
arjantijms Mar 1, 2024
970ea8f
Update dependencies for Jakarta 11 M2
arjantijms Mar 1, 2024
69779a5
Quick implementation of changes in wrappers for Persistence
arjantijms Mar 1, 2024
5d62ca6
Update various versions in pom
arjantijms Mar 1, 2024
ca4d998
Remove patches we don't need anymore
arjantijms Mar 1, 2024
9b5a53f
Update documentation page
avpinchuk Mar 2, 2024
a128bb0
Merge pull request #24839 from avpinchuk/documentation_7_0_13
avpinchuk Mar 5, 2024
bdccba6
Integrate various Jakarta EE 11 M2 components
arjantijms Mar 5, 2024
2d569df
Fixed dependencies of concurrency TCK
dmatej Mar 5, 2024
8087863
Merge pull request #24841 from dmatej/fix-concurrency-tck
arjantijms Mar 6, 2024
4e3d15e
Fixes issue #24843 log a warning in the rare case the Resource handle
escay Mar 6, 2024
98c9fee
Updates javadoc for #24843 Removes the "throw new IllegalStateException"
escay Mar 7, 2024
7a48f4e
Fixes issue #24845 - add new checkstyle rule: UnusedImports
escay Mar 7, 2024
5f9385e
Merge pull request #24844 from escay/issue_24843
arjantijms Mar 7, 2024
af94219
Merge pull request #24846 from escay/issue_24845
dmatej Mar 8, 2024
baace13
SSL Configurator fix causing CertificateRequests not being made in SS…
lisa-lthorrold Mar 8, 2024
52e6b5b
Merge pull request #24847 from lisa-lthorrold/ssl_parameter_fix
dmatej Mar 9, 2024
1ae7584
Integrate JSch 0.2.17
avpinchuk Mar 9, 2024
d9b7ee7
Merge pull request #24848 from avpinchuk/jsch_0_2_17
dmatej Mar 9, 2024
8dded39
Fixes command progress status
avpinchuk Mar 10, 2024
aa8aad7
Fixed report.dir
dmatej Mar 11, 2024
be59dd2
Fixed dependencies of the REST TCK
dmatej Mar 11, 2024
ceea790
Merge pull request #24853 from dmatej/tck-rest-fix
dmatej Mar 11, 2024
4d4cb75
Merge pull request #24852 from dmatej/tck-authentication-fix
arjantijms Mar 11, 2024
3e5203c
Merge pull request #24850 from avpinchuk/progress-status
hs536 Mar 12, 2024
2d4455d
Integrate Faces M2 and Tyrus M2
arjantijms Mar 12, 2024
10ea074
Merge remote-tracking branch 'origin/master' into 8.0
arjantijms Mar 12, 2024
0f7aabf
Fix checkstyle violations and update some more
arjantijms Mar 12, 2024
dba3298
Remove Tyrus patch and use of security manager for quick look
arjantijms Mar 13, 2024
d128959
Version changed
arjantijms Mar 14, 2024
30d6d49
Back to milestones
arjantijms Mar 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Expand Up @@ -19,7 +19,6 @@
import com.sun.enterprise.util.OS;

import java.io.*;
import java.util.*;

public class BackupUtils {

Expand Down
Expand Up @@ -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.
Expand Down
Expand Up @@ -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 {
Expand Down
Expand Up @@ -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;

/**
Expand Down
Expand Up @@ -16,7 +16,6 @@

package org.glassfish.admingui.common.handlers;

import java.io.UnsupportedEncodingException;
import java.util.Map;
import java.util.List;

Expand Down
Expand Up @@ -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;

Expand Down
Expand Up @@ -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;

/**
Expand Down
Expand Up @@ -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;

Expand Down
Expand Up @@ -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;

/**
Expand Down
Expand Up @@ -37,8 +37,6 @@
import java.util.Map;
import java.util.HashMap;

import java.util.Set;


public class JndiHandlers {

Expand Down
Expand Up @@ -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;


/**
Expand Down
Expand Up @@ -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;

Expand Down
Expand Up @@ -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;


/**
Expand Down
Expand Up @@ -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;


/**
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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.
Expand Down
Expand Up @@ -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.
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -18,7 +18,6 @@

import com.sun.enterprise.deployment.ApplicationClientDescriptor;
import com.sun.enterprise.deployment.runtime.JavaWebStartAccessDescriptor;
import org.glassfish.appclient.server.core.AppClientServerApplication;

/**
*
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Expand Up @@ -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;

/**
*
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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;

/**
Expand Down