diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java index 717e58027..623ea07d1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java @@ -82,6 +82,8 @@ public class AdminUpgradeAction extends FessAdminAction { private static final String VERSION_13_9 = "13.9"; + private static final String VERSION_13_10 = "13.10"; + // =================================================================================== // Attribute // @@ -166,6 +168,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -193,6 +196,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -219,6 +223,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -244,6 +249,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -268,6 +274,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -291,6 +298,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -313,6 +321,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -333,6 +342,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_6(); upgradeFrom13_7(); upgradeFrom13_8(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -353,6 +363,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -372,6 +383,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -390,6 +402,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -407,6 +420,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -423,6 +437,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -438,6 +453,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -452,6 +468,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -465,6 +482,7 @@ public class AdminUpgradeAction extends FessAdminAction { try { upgradeFrom13_8(); upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -477,6 +495,7 @@ public class AdminUpgradeAction extends FessAdminAction { } else if (VERSION_13_9.equals(form.targetVersion)) { try { upgradeFrom13_9(); + upgradeFrom13_10(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -486,6 +505,18 @@ public class AdminUpgradeAction extends FessAdminAction { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_9, e.getLocalizedMessage())); } + } else if (VERSION_13_10.equals(form.targetVersion)) { + try { + upgradeFrom13_10(); + 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_13_10, e.getLocalizedMessage())); + } } else { saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL)); } @@ -573,6 +604,10 @@ public class AdminUpgradeAction extends FessAdminAction { // nothing } + private void upgradeFrom13_10() { + // nothing + } + private void upgradeFromAll() { // nothing } diff --git a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp index 96b96b5c0..e3c3c6d0c 100644 --- a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp +++ b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp @@ -68,6 +68,7 @@ 13.7 13.8 13.9 + 13.10