fix #2697 update eol and upgrade page
This commit is contained in:
Shinsuke Sugaya
parent
ad94847d61
commit
676f621870
3 changed files with 43 additions and 2 deletions
|
|
@ -87,7 +87,9 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
|
||||
private static final String VERSION_14_2 = "14.2";
|
||||
|
||||
private static final String VERSION_14_3 = "14.4";
|
||||
private static final String VERSION_14_3 = "14.3";
|
||||
|
||||
private static final String VERSION_14_4 = "14.4";
|
||||
|
||||
// ===================================================================================
|
||||
// Attribute
|
||||
|
|
@ -177,6 +179,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -209,6 +212,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -240,6 +244,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -270,6 +275,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -299,6 +305,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -327,6 +334,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -354,6 +362,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -380,6 +389,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -405,6 +415,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -429,6 +440,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -452,6 +464,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -473,6 +486,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_0();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -493,6 +507,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_0();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -512,6 +527,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_0();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -530,6 +546,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_0();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -548,6 +565,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -565,6 +583,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -581,6 +600,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -596,6 +616,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -610,6 +631,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -623,6 +645,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
try {
|
||||
upgradeFrom14_2();
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -635,6 +658,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
} else if (VERSION_14_3.equals(form.targetVersion)) {
|
||||
try {
|
||||
upgradeFrom14_3();
|
||||
upgradeFrom14_4();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -644,6 +668,18 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
logger.warn("Failed to upgrade data.", e);
|
||||
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_3, e.getLocalizedMessage()));
|
||||
}
|
||||
} else if (VERSION_14_4.equals(form.targetVersion)) {
|
||||
try {
|
||||
upgradeFrom14_4();
|
||||
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_4, e.getLocalizedMessage()));
|
||||
}
|
||||
} else {
|
||||
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
|
||||
}
|
||||
|
|
@ -800,6 +836,10 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
// nothing
|
||||
}
|
||||
|
||||
private void upgradeFrom14_4() {
|
||||
// nothing
|
||||
}
|
||||
|
||||
private void upgradeFromAll() {
|
||||
// nothing
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ public class SystemHelper {
|
|||
logger.debug("Initialize {}", this.getClass().getSimpleName());
|
||||
}
|
||||
final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
|
||||
cal.set(2024, 2 - 1, 24); // EOL Date
|
||||
cal.set(2024, 5 - 1, 1); // EOL Date
|
||||
eolTime = cal.getTimeInMillis();
|
||||
if (isEoled()) {
|
||||
logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@
|
|||
<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:option value="14.4">14.4</la:option>
|
||||
</la:select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue