Redesign of GlassFish bootstrap

appserver/admin/backup/src/main/java/com/sun/enterprise/backup/ListManager.java

@@ -22,7 +22,6 @@
 
 package com.sun.enterprise.backup;
 
-import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.util.ColumnFormatter;
 import com.sun.enterprise.util.io.FileUtils;
 
@@ -33,6 +32,8 @@
 import java.util.List;
 import java.util.TreeSet;
 
+import org.glassfish.main.jdke.i18n.LocalStringsImpl;
+
 
 /**
  *

appserver/admin/cli-optional/pom.xml

@@ -80,7 +80,8 @@
             <groupId>org.glassfish.main.admin</groupId>
             <artifactId>admin-cli</artifactId>
             <version>${project.version}</version>
-        </dependency>        <dependency>
+        </dependency>
+        <dependency>
             <groupId>org.glassfish.main.core</groupId>
             <artifactId>glassfish</artifactId>
             <version>${project.version}</version>
@@ -138,18 +139,5 @@
                 </includes>
             </resource>
         </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-+                           <classpathPrefix>../../modules</classpathPrefix>
-                        </manifest>
-                     </archive>
-                </configuration>
-            </plugin>
-        </plugins>
     </build>
 </project>

appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupCommands.java

@@ -19,7 +19,6 @@
 
 import com.sun.enterprise.admin.servermgmt.cli.LocalDomainCommand;
 import com.sun.enterprise.backup.BackupRequest;
-import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.util.ObjectAnalyzer;
 
 import java.io.File;
@@ -28,6 +27,7 @@
 import org.glassfish.api.Param;
 import org.glassfish.api.admin.CommandException;
 import org.glassfish.api.admin.CommandValidationException;
+import org.glassfish.main.jdke.i18n.LocalStringsImpl;
 
 import static com.sun.enterprise.util.Utility.isEmpty;
 import static com.sun.enterprise.util.io.DomainDirs.getDefaultDomainsDir;

appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/BackupDomainCommand.java

@@ -21,7 +21,6 @@
 import com.sun.enterprise.backup.BackupException;
 import com.sun.enterprise.backup.BackupManager;
 import com.sun.enterprise.backup.BackupWarningException;
-import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.universal.process.ProcessUtils;
 import com.sun.enterprise.util.ObjectAnalyzer;
 
@@ -30,6 +29,7 @@
 import org.glassfish.api.Param;
 import org.glassfish.api.admin.CommandException;
 import org.glassfish.hk2.api.PerLookup;
+import org.glassfish.main.jdke.i18n.LocalStringsImpl;
 import org.jvnet.hk2.annotations.Service;
 
 /**

appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/DatabaseCommand.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Contributors to the Eclipse Foundation
+ * Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -19,16 +19,16 @@
 
 import com.sun.enterprise.admin.cli.CLICommand;
 import com.sun.enterprise.admin.cli.ClassPathBuilder;
-import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.util.OS;
 
 import java.io.File;
 
 import org.glassfish.api.Param;
 import org.glassfish.api.admin.CommandException;
 import org.glassfish.api.admin.CommandValidationException;
+import org.glassfish.main.jdke.i18n.LocalStringsImpl;
 
-import static com.sun.enterprise.util.SystemPropertyConstants.DERBY_ROOT_PROPERTY;
+import static com.sun.enterprise.glassfish.bootstrap.cfg.BootstrapKeys.DERBY_ROOT_PROP_NAME;
 import static com.sun.enterprise.util.SystemPropertyConstants.INSTALL_ROOT_PROPERTY;
 import static com.sun.enterprise.util.SystemPropertyConstants.JAVA_ROOT_PROPERTY;
 
@@ -55,6 +55,7 @@ public abstract class DatabaseCommand extends CLICommand {
     @Param(name = "dbport", optional = true, defaultValue = DB_PORT_DEFAULT)
     protected String dbPort;
 
+    protected final ClassPathBuilder modulepath = new ClassPathBuilder();
     protected final ClassPathBuilder sClasspath = new ClassPathBuilder();
     protected final ClassPathBuilder sDatabaseClasspath = new ClassPathBuilder();
 
@@ -77,10 +78,11 @@ protected void prepareProcessExecutor() throws Exception {
         }
 
         javaHome = new File(getSystemProperty(JAVA_ROOT_PROPERTY));
-        dbLocation = new File(getSystemProperty(DERBY_ROOT_PROPERTY));
+        dbLocation = new File(getSystemProperty(DERBY_ROOT_PROP_NAME));
         checkIfDbInstalled(dbLocation);
 
-        sClasspath.add(new File(installRoot, "lib/asadmin/cli-optional.jar"));
+        modulepath.addAll(new File(installRoot, "lib/bootstrap"), f -> f.isFile());
+        sClasspath.add(new File(installRoot, System.getProperty("java.class.path")));
         sDatabaseClasspath.add(dbLocation, "lib", "derby.jar")
                           .add(dbLocation, "lib", "derbyshared.jar")
                           .add(dbLocation, "lib", "derbytools.jar")
@@ -133,22 +135,28 @@ protected String[] pingDatabaseCmd(boolean bRedirect) throws Exception {
                 getJavaExe().toString(),
                 "-Djava.library.path=" + installRoot + File.separator + "lib",
                 "-Dderby.storage.fileSyncTransactionLog=True",
+                "--module-path",
+                modulepath.toString(),
+                "--add-modules",
+                "ALL-MODULE-PATH",
                 "-cp", sClasspath + File.pathSeparator + sDatabaseClasspath,
-
                 "com.sun.enterprise.admin.cli.optional.DerbyControl",
                 "ping",
-                dbHost, dbPort, Boolean.valueOf(bRedirect).toString() };
+                dbHost, dbPort, Boolean.toString(bRedirect) };
 
         }
 
         return new String[] {
                 getJavaExe().toString(),
                 "-Djava.library.path=" + installRoot + File.separator + "lib",
+                "--module-path",
+                modulepath.toString(),
+                "--add-modules",
+                "ALL-MODULE-PATH",
                 "-cp", sClasspath + File.pathSeparator + sDatabaseClasspath,
-
                 "com.sun.enterprise.admin.cli.optional.DerbyControl",
                 "ping",
-                dbHost, dbPort, Boolean.valueOf(bRedirect).toString() };
+                dbHost, dbPort, Boolean.toString(bRedirect) };
     }
 
     /**

appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/ListBackupsCommand.java

@@ -20,13 +20,13 @@
 import com.sun.enterprise.backup.BackupException;
 import com.sun.enterprise.backup.BackupWarningException;
 import com.sun.enterprise.backup.ListManager;
-import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.util.ObjectAnalyzer;
 
 import java.io.File;
 
 import org.glassfish.api.admin.CommandException;
 import org.glassfish.hk2.api.PerLookup;
+import org.glassfish.main.jdke.i18n.LocalStringsImpl;
 import org.jvnet.hk2.annotations.Service;
 
 /**

appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/RestoreDomainCommand.java

@@ -21,7 +21,6 @@
 import com.sun.enterprise.backup.BackupRequest;
 import com.sun.enterprise.backup.BackupWarningException;
 import com.sun.enterprise.backup.RestoreManager;
-import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.universal.process.ProcessUtils;
 import com.sun.enterprise.util.ObjectAnalyzer;
 
@@ -32,6 +31,7 @@
 import org.glassfish.api.admin.CommandException;
 import org.glassfish.api.admin.CommandValidationException;
 import org.glassfish.hk2.api.PerLookup;
+import org.glassfish.main.jdke.i18n.LocalStringsImpl;
 import org.jvnet.hk2.annotations.Service;
 
 import static com.sun.enterprise.util.Utility.isAllNull;

appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StartDatabaseCommand.java

@@ -18,7 +18,6 @@
 
 import com.sun.enterprise.admin.cli.CLIProcessExecutor;
 import com.sun.enterprise.universal.glassfish.GFLauncherUtils;
-import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.util.OS;
 
 import java.io.File;
@@ -30,6 +29,7 @@
 import org.glassfish.api.admin.CommandException;
 import org.glassfish.api.admin.CommandValidationException;
 import org.glassfish.hk2.api.PerLookup;
+import org.glassfish.main.jdke.i18n.LocalStringsImpl;
 import org.jvnet.hk2.annotations.Service;
 
 import static com.sun.enterprise.admin.cli.optional.DerbyControl.DB_LOG_FILENAME;
@@ -92,6 +92,11 @@ public String[] startDatabaseCmd() {
             cmd.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:9011");
         }
 
+        cmd.add("--module-path");
+        cmd.add(modulepath.toString());
+        cmd.add("--add-modules");
+        cmd.add("ALL-MODULE-PATH");
+
         cmd.add("-cp");
         cmd.add(sClasspath + pathSeparator + sDatabaseClasspath);
         if (jvmoptions != null) {
@@ -117,8 +122,11 @@ public String[] sysinfoCmd() throws Exception {
                 javaHome + separator + "bin" + separator + "java",
                 "-Djava.library.path=" + installRoot + separator + "lib",
                 "-Dderby.storage.fileSyncTransactionLog=True",
+                "--module-path",
+                modulepath.toString(),
+                "--add-modules",
+                "ALL-MODULE-PATH",
                 "-cp", sClasspath + pathSeparator + sDatabaseClasspath,
-
                 "com.sun.enterprise.admin.cli.optional.DerbyControl",
                 "sysinfo",
                 dbHost, dbPort, "false" };
@@ -127,8 +135,11 @@ public String[] sysinfoCmd() throws Exception {
         return new String[] {
             javaHome + separator + "bin" + separator + "java",
             "-Djava.library.path=" + installRoot + separator + "lib",
+            "--module-path",
+            modulepath.toString(),
+            "--add-modules",
+            "ALL-MODULE-PATH",
             "-cp", sClasspath + pathSeparator + sDatabaseClasspath,
-
             "com.sun.enterprise.admin.cli.optional.DerbyControl",
             "sysinfo",
             dbHost, dbPort, "false" };
@@ -144,6 +155,11 @@ public String[] executeSQLCmd() throws Exception {
             cmd.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=localhost:9012");
         }
 
+        cmd.add("--module-path");
+        cmd.add(modulepath.toString());
+        cmd.add("--add-modules");
+        cmd.add("ALL-MODULE-PATH");
+
         cmd.add("-cp");
         cmd.add(sClasspath + pathSeparator + sDatabaseClasspath);
 
@@ -158,7 +174,7 @@ public String[] executeSQLCmd() throws Exception {
             cmd.add(dbPassword);
         }
 
-        return cmd.toArray(new String[cmd.size()]);
+        return cmd.toArray(String[]::new);
     }
 
     /**

appserver/admin/cli-optional/src/main/java/com/sun/enterprise/admin/cli/optional/StopDatabaseCommand.java

@@ -19,7 +19,6 @@
 
 import com.sun.enterprise.admin.cli.CLIProcessExecutor;
 import com.sun.enterprise.admin.cli.Environment;
-import com.sun.enterprise.universal.i18n.LocalStringsImpl;
 import com.sun.enterprise.util.OS;
 
 import java.io.File;
@@ -29,6 +28,7 @@
 import org.glassfish.api.admin.CommandException;
 import org.glassfish.api.admin.CommandValidationException;
 import org.glassfish.hk2.api.PerLookup;
+import org.glassfish.main.jdke.i18n.LocalStringsImpl;
 import org.jvnet.hk2.annotations.Service;
 
 import static com.sun.enterprise.admin.cli.CLIUtil.readPasswordFileOptions;
@@ -81,8 +81,11 @@ public String[] stopDatabaseCmd() throws Exception {
                     javaHome + separator + "bin" + separator + "java",
                     "-Djava.library.path=" + installRoot + separator + "lib",
                     "-Dderby.storage.fileSyncTransactionLog=True",
+                    "--module-path",
+                    modulepath.toString(),
+                    "--add-modules",
+                    "ALL-MODULE-PATH",
                     "-cp", sClasspath + pathSeparator + sDatabaseClasspath,
-
                     "com.sun.enterprise.admin.cli.optional.DerbyControl",
                     "shutdown",
                     dbHost, dbPort, "false" };
@@ -91,19 +94,25 @@ public String[] stopDatabaseCmd() throws Exception {
             return new String[] {
                 javaHome + separator + "bin" + separator + "java",
                 "-Djava.library.path=" + installRoot + separator + "lib",
+                "--module-path",
+                modulepath.toString(),
+                "--add-modules",
+                "ALL-MODULE-PATH",
                 "-cp", sClasspath + pathSeparator + sDatabaseClasspath,
-
                 "com.sun.enterprise.admin.cli.optional.DerbyControl",
                 "shutdown",
                 dbHost, dbPort, "false" };
         }
 
         if (OS.isDarwin()) {
             return new String[] { javaHome + separator + "bin" + separator + "java",
-                "-Djava.library.path=" + installRoot + separator +
-                "lib", "-Dderby.storage.fileSyncTransactionLog=True",
+                "-Djava.library.path=" + installRoot + separator + "lib",
+                "-Dderby.storage.fileSyncTransactionLog=True",
+                "--module-path",
+                modulepath.toString(),
+                "--add-modules",
+                "ALL-MODULE-PATH",
                 "-cp", sClasspath + pathSeparator + sDatabaseClasspath,
-
                 "com.sun.enterprise.admin.cli.optional.DerbyControl",
                 "shutdown",
                 dbHost, dbPort, "false", dbUser, dbPassword };
@@ -112,8 +121,11 @@ public String[] stopDatabaseCmd() throws Exception {
         return new String[] {
             javaHome + separator + "bin" + separator + "java",
             "-Djava.library.path=" + installRoot + separator + "lib",
+            "--module-path",
+            modulepath.toString(),
+            "--add-modules",
+            "ALL-MODULE-PATH",
             "-cp", sClasspath + pathSeparator + sDatabaseClasspath,
-
             "com.sun.enterprise.admin.cli.optional.DerbyControl",
             "shutdown",
             dbHost, dbPort, "false", dbUser, dbPassword };

appserver/admin/cli/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.glassfish.main.admin</groupId>
             <artifactId>admin-cli</artifactId>
-            <version>${project.parent.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -59,12 +59,7 @@
                     <archive>
                         <manifest>
                             <mainClass>org.glassfish.admin.cli.AsadminMain</mainClass>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>../../modules</classpathPrefix>
                         </manifest>
-                        <manifestEntries>
-                            <Class-Path>../../lib/bootstrap/glassfish-jul-extension.jar</Class-Path>
-                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>

appserver/admin/cli/src/main/java/org/glassfish/admin/cli/AsadminMain.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -29,13 +30,17 @@ public static void main(String[] args) {
 //        Metrix.event("START");
         Environment.setPrefix("AS_ADMIN_");
         Environment.setShortPrefix("AS_");
-        int code = new AsadminMain().doMain(args);
+
+        AsadminMain main = new AsadminMain();
+        int code = main.doMain(args);
 //        Metrix.event("DONE");
 //        System.out.println("METRIX:");
 //        System.out.println(Metrix.getInstance().toString());
         System.exit(code);
     }
 
+
+    @Override
     protected String getCommandName() {
         return "asadmin";
     }