Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Update APIs except telemetry to support MP 6.0 #65

Merged
merged 2 commits into from
Apr 27, 2023
Merged

Update APIs except telemetry to support MP 6.0 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aa5cf8
Update APIs except telemetry to support MP 6.0
Apr 27, 2023
c3c956e
Update glassfish src files
Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.classpath
.factorypath
.project
.idea
.settings/
dependency-reduced-pom.xml
target/
2 changes: 1 addition & 1 deletion launcher-dist/src/main/resources/config/branding/glassfish-version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
11 changes: 1 addition & 10 deletions launcher-impl/bootstrap/src/main/java/com/fujitsu/launcher/LauncherMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;

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

Expand Down
Loading