fix #2670 update eol and upgrade page
This commit is contained in:
Shinsuke Sugaya
parent
39ac90f300
commit
87daf31d24
3 changed files with 40 additions and 1 deletions
|
|
@ -85,6 +85,8 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
|
||||
private static final String VERSION_14_1 = "14.1";
|
||||
|
||||
private static final String VERSION_14_2 = "14.2";
|
||||
|
||||
// ===================================================================================
|
||||
// Attribute
|
||||
//
|
||||
|
|
@ -171,6 +173,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -201,6 +204,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -230,6 +234,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -258,6 +263,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -285,6 +291,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -311,6 +318,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -336,6 +344,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -360,6 +369,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -383,6 +393,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -405,6 +416,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -426,6 +438,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -445,6 +458,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_16();
|
||||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -463,6 +477,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_16();
|
||||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -480,6 +495,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_16();
|
||||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -496,6 +512,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_16();
|
||||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -512,6 +529,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -527,6 +545,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -541,6 +560,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
upgradeFrom13_17();
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -554,6 +574,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
try {
|
||||
upgradeFrom14_0();
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -566,6 +587,7 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
} else if (VERSION_14_1.equals(form.targetVersion)) {
|
||||
try {
|
||||
upgradeFrom14_1();
|
||||
upgradeFrom14_2();
|
||||
upgradeFromAll();
|
||||
|
||||
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
|
||||
|
|
@ -575,6 +597,18 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
logger.warn("Failed to upgrade data.", e);
|
||||
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_1, e.getLocalizedMessage()));
|
||||
}
|
||||
} else if (VERSION_14_2.equals(form.targetVersion)) {
|
||||
try {
|
||||
upgradeFrom14_2();
|
||||
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_2, e.getLocalizedMessage()));
|
||||
}
|
||||
} else {
|
||||
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
|
||||
}
|
||||
|
|
@ -723,6 +757,10 @@ public class AdminUpgradeAction extends FessAdminAction {
|
|||
// nothing
|
||||
}
|
||||
|
||||
private void upgradeFrom14_2() {
|
||||
// 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(2023, 10 - 1, 26); // EOL Date
|
||||
cal.set(2023, 12 - 1, 28); // EOL Date
|
||||
eolTime = cal.getTimeInMillis();
|
||||
if (isEoled()) {
|
||||
logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@
|
|||
<la:option value="13.17">13.17</la:option>
|
||||
<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:select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue