Преглед изворни кода

fix #2681 update eol and upgrade page

Shinsuke Sugaya пре 2 година
родитељ
комит
e32c69f729

+ 39 - 0
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java

@@ -87,6 +87,8 @@ public class AdminUpgradeAction extends FessAdminAction {
 
     private static final String VERSION_14_2 = "14.2";
 
+    private static final String VERSION_14_3 = "14.4";
+
     // ===================================================================================
     //                                                                           Attribute
     //
@@ -174,6 +176,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -205,6 +208,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -235,6 +239,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -264,6 +269,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -292,6 +298,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -319,6 +326,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -345,6 +353,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -370,6 +379,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -394,6 +404,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -417,6 +428,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -439,6 +451,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -459,6 +472,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_17();
                 upgradeFrom14_0();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -478,6 +492,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_17();
                 upgradeFrom14_0();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -496,6 +511,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_17();
                 upgradeFrom14_0();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -513,6 +529,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom13_17();
                 upgradeFrom14_0();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -530,6 +547,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -546,6 +564,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -561,6 +580,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -575,6 +595,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_0();
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -588,6 +609,7 @@ public class AdminUpgradeAction extends FessAdminAction {
             try {
                 upgradeFrom14_1();
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -600,6 +622,7 @@ public class AdminUpgradeAction extends FessAdminAction {
         } else if (VERSION_14_2.equals(form.targetVersion)) {
             try {
                 upgradeFrom14_2();
+                upgradeFrom14_3();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -609,6 +632,18 @@ public class AdminUpgradeAction extends FessAdminAction {
                 logger.warn("Failed to upgrade data.", e);
                 saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_2, e.getLocalizedMessage()));
             }
+        } else if (VERSION_14_3.equals(form.targetVersion)) {
+            try {
+                upgradeFrom14_3();
+                upgradeFromAll();
+
+                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
+
+                systemHelper.reloadConfiguration();
+            } catch (final Exception e) {
+                logger.warn("Failed to upgrade data.", e);
+                saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_3, e.getLocalizedMessage()));
+            }
         } else {
             saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
         }
@@ -761,6 +796,10 @@ public class AdminUpgradeAction extends FessAdminAction {
         // nothing
     }
 
+    private void upgradeFrom14_3() {
+        // nothing
+    }
+
     private void upgradeFromAll() {
         // nothing
     }

+ 1 - 1
src/main/java/org/codelibs/fess/helper/SystemHelper.java

@@ -126,7 +126,7 @@ public class SystemHelper {
             logger.debug("Initialize {}", this.getClass().getSimpleName());
         }
         final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        cal.set(2023, 12 - 1, 28); // EOL Date
+        cal.set(2024, 2 - 1, 24); // EOL Date
         eolTime = cal.getTimeInMillis();
         if (isEoled()) {
             logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");

+ 1 - 0
src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp

@@ -71,6 +71,7 @@
 											<la:option value="14.0">14.0</la:option>
 											<la:option value="14.1">14.1</la:option>
 											<la:option value="14.2">14.2</la:option>
+											<la:option value="14.3">14.3</la:option>
 										</la:select>
 									</div>
 								</div>