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 623ea07d1170006d453921cee4ade47dea402458..16519e282e40a6eaf869ca0215aeaa3d61ef9156 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 @@ -84,6 +84,8 @@ public class AdminUpgradeAction extends FessAdminAction { private static final String VERSION_13_10 = "13.10"; + private static final String VERSION_13_11 = "13.11"; + // =================================================================================== // Attribute // @@ -169,6 +171,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -197,6 +200,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -224,6 +228,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -250,6 +255,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -275,6 +281,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -299,6 +306,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -322,6 +330,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -343,6 +352,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_7(); upgradeFrom13_8(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -364,6 +374,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -384,6 +395,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -403,6 +415,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -421,6 +434,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -438,6 +452,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -454,6 +469,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -469,6 +485,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -483,6 +500,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_8(); upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -496,6 +514,7 @@ public class AdminUpgradeAction extends FessAdminAction { try { upgradeFrom13_9(); upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -508,6 +527,7 @@ public class AdminUpgradeAction extends FessAdminAction { } else if (VERSION_13_10.equals(form.targetVersion)) { try { upgradeFrom13_10(); + upgradeFrom13_11(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -517,6 +537,18 @@ public class AdminUpgradeAction extends FessAdminAction { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_10, e.getLocalizedMessage())); } + } else if (VERSION_13_11.equals(form.targetVersion)) { + try { + upgradeFrom13_11(); + 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_11, e.getLocalizedMessage())); + } } else { saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL)); } @@ -608,6 +640,10 @@ public class AdminUpgradeAction extends FessAdminAction { // nothing } + private void upgradeFrom13_11() { + // 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 e3c3c6d0c53d9f38aaeab65077c6011d7f14aada..9765c64f0952b07da98e3b4e3a1398971ff2b34f 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 @@ -69,6 +69,7 @@ <la:option value="13.8">13.8</la:option> <la:option value="13.9">13.9</la:option> <la:option value="13.10">13.10</la:option> + <la:option value="13.11">13.11</la:option> </la:select> </div> </div>