From 379ec7fca369119b8b6e62df203f1da17639bfea Mon Sep 17 00:00:00 2001 From: Rhys Williams <170514543+Viii3@users.noreply.github.com> Date: Wed, 21 May 2025 15:23:44 +0100 Subject: [PATCH 1/3] FISH-11137: Add warlibs support to add-library. --- .../org/glassfish/deployment/admin/AddLibraryCommand.java | 5 ++++- .../manpages/org/glassfish/deployment/admin/add-library.1 | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 08811964243..5172e0e66f0 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 @@ -96,7 +96,7 @@ public class AddLibraryCommand implements AdminCommand { @Param(primary=true, multiple=true) File[] files = null; - @Param(optional=true, acceptableValues="common, app") + @Param(optional=true, acceptableValues="common, app, war") String type = "common"; @Inject @@ -124,6 +124,9 @@ public void execute(AdminCommandContext context) { if (type.equals("app")) { libDir = new File(libDir, "applibs"); } + else if (type.equals("war")) { + libDir = new File(libDir, "warlibs"); + } // rename or copy the library file to the appropriate // library directory diff --git a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/add-library.1 b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/add-library.1 index a7b46a43529..026f1144e5e 100644 --- a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/add-library.1 +++ b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/add-library.1 @@ -56,6 +56,10 @@ OPTIONS Adds the library files to the application-specific class loader directory, domain-dir/lib/applibs. + war + Adds the library files to the war-packaged class loader directory, + domain-dir/lib/warlibs. + For more information about these directories, see "Class Loaders" in Oracle GlassFish Server Application Development Guide. From 1b3c743754862c7bdd6b427359767fd0552351ef Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 23 May 2025 10:47:17 +0100 Subject: [PATCH 2/3] Update copyright --- .../java/org/glassfish/deployment/admin/AddLibraryCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5172e0e66f0..e88c9ac2ec9 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 @@ -37,7 +37,7 @@ * only if the new code is made subject to such option by the copyright * holder. * - * Portions Copyright 2017-2022 Payara Foundation and/or affiliates + * Portions Copyright 2017-2025 Payara Foundation and/or affiliates */ package org.glassfish.deployment.admin; From f9d52fe39da2345b46ae7de636cfd21004aacf18 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 23 May 2025 11:24:38 +0100 Subject: [PATCH 3/3] FISH-11137 Missed war option --- .../main/manpages/org/glassfish/deployment/admin/add-library.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/add-library.1 b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/add-library.1 index 026f1144e5e..ac8c45bf130 100644 --- a/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/add-library.1 +++ b/nucleus/deployment/admin/src/main/manpages/org/glassfish/deployment/admin/add-library.1 @@ -4,7 +4,7 @@ NAME add-library - adds one or more library JAR files to GlassFish Server SYNOPSIS - add-library [--help] [--type={common|ext|app}] [--upload={false|true}] + add-library [--help] [--type={common|ext|app|war}] [--upload={false|true}] library-file-path [library-file-path ... ]