Merge pull request #65 from kosakak/update-mp6

Update APIs except telemetry to support MP 6.0
fujitsu · Apr 27, 2023 · 947b374 · 947b374
2 parents 0916cfc + c3c956e
commit 947b374
Show file tree

Hide file tree

Showing 47 changed files with 7,084 additions and 5,513 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 .classpath
 .factorypath
 .project
+.idea
 .settings/
 dependency-reduced-pom.xml
 target/
diff --git a/launcher-dist/src/main/resources/config/branding/glassfish-version.properties b/launcher-dist/src/main/resources/config/branding/glassfish-version.properties
@@ -12,7 +12,7 @@
 product_name=Launcher
 brief_product_name=Launcher
 abbrev_product_name=launcher
-major_version=4
+major_version=5
 minor_version=0
 update_version=
 build_id=

diff --git a/launcher-impl/bootstrap/src/main/java/com/fujitsu/launcher/LauncherMain.java b/launcher-impl/bootstrap/src/main/java/com/fujitsu/launcher/LauncherMain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2022 Fujitsu Limited and/or its affiliates. All rights
+ * Copyright (c) 2017-2023 Fujitsu Limited and/or its affiliates. All rights
  * reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -44,7 +44,6 @@
 import com.fujitsu.launcher.cli.LauncherCommandLine;
 import com.sun.enterprise.glassfish.bootstrap.Constants;
 import com.sun.enterprise.module.bootstrap.StartupContext;
-import com.sun.enterprise.server.logging.GFFileHandler;
 
 /**
  *
@@ -262,19 +261,11 @@ public static Thread createPostInitShutdownHook(GlassFish glassfish) {
             public void run() {
                 try {
                     glassfish.stop();
-                    // work-around for deleting server.log on disposal
-                    forceCloseLog();
                     glassfish.dispose();
                 } catch (Exception e) {
                     // fall through;
                 }
             }
-
-            private void forceCloseLog() {
-                GFFileHandler h = Globals.get(GFFileHandler.class);
-                h.preDestroy();
-                h.close();
-            }
         };
     }