Migrate configurator/upgrade wizard from Apache Click to Jakarta Servlets + FreeMarker

openam-core/pom.xml

@@ -257,15 +257,8 @@
         <!-- Use all Legacy extlib Dependencies for now and scale down as necessary. -->
 
         <dependency>
-            <groupId>org.apache.click</groupId>
-            <artifactId>click-nodeps</artifactId>
-            <version>${click.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.click</groupId>
-            <artifactId>click-extras</artifactId>
-            <version>${click.version}</version>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
         </dependency>
 
         <dependency>

openam-core/src/main/java/com/sun/identity/config/DefaultSummary.java

@@ -30,7 +30,6 @@
 
 package com.sun.identity.config;
 
-import com.sun.identity.config.util.ProtectedPage;
 import com.sun.identity.setup.AMSetupServlet;
 import com.sun.identity.setup.AMSetupUtils;
 import com.sun.identity.setup.HttpServletRequestWrapper;
@@ -39,17 +38,12 @@
 import jakarta.servlet.http.HttpServletRequest;
 
 import com.sun.identity.shared.Constants;
-import org.openidentityplatform.openam.click.control.ActionLink;
+import org.openidentityplatform.openam.config.servlet.ConfiguratorAction;
+import org.openidentityplatform.openam.config.servlet.ProtectedSetupPage;
 
-public class DefaultSummary extends ProtectedPage {
-
-    public ActionLink createConfig = 
-        new ActionLink("createDefaultConfig", this, "createDefaultConfig");
-
-    public void onInit() {
-        super.onInit();
-    }
-
+public class DefaultSummary extends ProtectedSetupPage {
+
+    @ConfiguratorAction
     public boolean createDefaultConfig() {
         HttpServletRequest req = getContext().getRequest();
         HttpServletRequestWrapper request = 
@@ -134,7 +128,6 @@ SetupConstants.CONFIG_VAR_BASE_DIR, getBaseDir(
             debug.error("DefaultSummary.createDefaultConfig()", e);
         }
         writeToResponse( ((responseString!=null)?responseString:"") );
-        setPath(null);
         return false;
     }
 }

openam-core/src/main/java/com/sun/identity/config/Options.java

@@ -25,53 +25,45 @@
  * $Id: Options.java,v 1.7 2009/01/05 23:17:09 veiming Exp $
  *
  * Portions Copyrighted 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems LLC.
  */
 
 package com.sun.identity.config;
 
-import com.sun.identity.config.util.TemplatedPage;
 import com.sun.identity.setup.AMSetupServlet;
 import com.sun.identity.setup.EmbeddedOpenDS;
-import org.openidentityplatform.openam.click.control.ActionLink;
 import org.forgerock.openam.upgrade.VersionUtils;
+import org.openidentityplatform.openam.config.servlet.SetupPage;
 
-public class Options extends TemplatedPage {
+public class Options extends SetupPage {
 
-    public ActionLink createConfigLink = new ActionLink("upgradeLink", this, "upgrade" );
-    public ActionLink testUrlLink = new ActionLink("coexistLink", this, "coexist" );
-    public ActionLink pushConfigLink = new ActionLink("olderUpgradeLink", this, "olderUpgrade" );
+    // Unlike the wizard/summary pages, this has no onSecurityCheck() override: the old Options
+    // extended TemplatedPage (not ProtectedPage), so it stayed reachable even once OpenAM is
+    // configured - that's how a completed install reaches the upgrade-options branch below.
+    // SetupPage's default onSecurityCheck() (always true) already matches that.
 
-    protected boolean upgrade = false;
-    protected boolean upgradeCompleted = false;
-    protected boolean isOpenDS1x = false;
-    protected boolean debugOn = false;
-
-    private java.util.Locale configLocale = null;
-
-    protected String getTitle() {
-        return isNewInstall() ? "configuration.options.title" : "upgrade.title";
-    }
+    @Override
+    public void onInit() {
+        super.onInit();
+
+        boolean upgrade = !isNewInstall();
+        addModel("upgrade", Boolean.valueOf(upgrade));
 
-    public void doInit() {
-        upgrade = !isNewInstall();
-        upgradeCompleted = AMSetupServlet.isUpgradeCompleted();
+        boolean upgradeCompleted = AMSetupServlet.isUpgradeCompleted();
         addModel("upgradeCompleted", Boolean.valueOf(upgradeCompleted));
-        addModel( "upgrade", Boolean.valueOf( upgrade ) );
 
         if (upgrade) {
-             addModel("currentVersion", VersionUtils.getCurrentVersion());
+            addModel("currentVersion", VersionUtils.getCurrentVersion());
         }
 
-        isOpenDS1x = EmbeddedOpenDS.isOpenDSVer1Installed();
+        boolean isOpenDS1x = EmbeddedOpenDS.isOpenDSVer1Installed();
         addModel("isOpenDS1x", Boolean.valueOf(isOpenDS1x));
 
         if (isOpenDS1x) {
             addModel("odsdir", AMSetupServlet.getBaseDir());
         }
-
-        debugOn = getContext().getRequest().getParameter( "debug" ) != null;
-
-        if (debugOn) {
+
+        if (getContext().getRequest().getParameter("debug") != null) {
             AMSetupServlet.enableDebug();
         }
     }