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 0205d8156..f3e36c34a 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 @@ -92,6 +92,8 @@ public class AdminUpgradeAction extends FessAdminAction { private static final String VERSION_13_14 = "13.14"; + private static final String VERSION_13_15 = "13.15"; + // =================================================================================== // Attribute // @@ -181,6 +183,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -213,6 +216,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -244,6 +248,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -274,6 +279,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -303,6 +309,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -331,6 +338,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -358,6 +366,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -383,6 +392,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -408,6 +418,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -432,6 +443,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -455,6 +467,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -477,6 +490,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -498,6 +512,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -518,6 +533,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -537,6 +553,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -555,6 +572,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -572,6 +590,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -588,6 +607,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -603,6 +623,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -617,6 +638,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom13_12(); upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -630,6 +652,7 @@ public class AdminUpgradeAction extends FessAdminAction { try { upgradeFrom13_13(); upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -642,6 +665,7 @@ public class AdminUpgradeAction extends FessAdminAction { } else if (VERSION_13_14.equals(form.targetVersion)) { try { upgradeFrom13_14(); + upgradeFrom13_15(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -651,6 +675,18 @@ public class AdminUpgradeAction extends FessAdminAction { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_14, e.getLocalizedMessage())); } + } else if (VERSION_13_15.equals(form.targetVersion)) { + try { + upgradeFrom13_15(); + 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_15, e.getLocalizedMessage())); + } } else { saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL)); } @@ -758,6 +794,10 @@ public class AdminUpgradeAction extends FessAdminAction { // nothing } + private void upgradeFrom13_15() { + // 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 0933f55a9..712173541 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 @@ -73,6 +73,7 @@ 13.12 13.13 13.14 + 13.15