0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2808 upgrade tasks for 14.12

Browse source
This commit is contained in:
Shinsuke Sugaya 2024-02-23 13:53:05 +09:00
parent 81b70b4070
commit f128e4abf2
3 changed files with 49 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
View file

@ -114,6 +114,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_14_10 = "14.10";
private static final String VERSION_14_11 = "14.11";
// ===================================================================================
// Attribute
//
@ -209,6 +211,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -248,6 +251,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -286,6 +290,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -323,6 +328,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -359,6 +365,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -394,6 +401,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -428,6 +436,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -461,6 +470,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -493,6 +503,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -524,6 +535,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -554,6 +566,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -582,6 +595,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -609,6 +623,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -635,6 +650,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -660,6 +676,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -685,6 +702,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -709,6 +727,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -732,6 +751,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -754,6 +774,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -775,6 +796,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -795,6 +817,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -814,6 +837,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -832,6 +856,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -849,6 +874,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -865,6 +891,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -880,6 +907,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -894,6 +922,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -907,6 +936,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -919,6 +949,7 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_14_10.equals(form.targetVersion)) {
try {
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -928,6 +959,18 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_10, e.getLocalizedMessage()));
}
} else if (VERSION_14_11.equals(form.targetVersion)) {
try {
upgradeFrom14_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_14_11, e.getLocalizedMessage()));
}
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@ -1143,6 +1186,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
private void upgradeFrom14_11() {
// nothing
}
private String[] getDictionaryPaths() {
try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("size", "1000").execute()) {
if (response.getHttpStatusCode() == 200) {

2
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -135,7 +135,7 @@ public class SystemHelper {
logger.debug("Initialize {}", this.getClass().getSimpleName());
}
final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
cal.set(2025, 4 - 1, 1); // EOL Date
cal.set(2025, 8 - 1, 1); // EOL Date
eolTime = cal.getTimeInMillis();
if (isEoled()) {
logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");

1
src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
View file

@ -79,6 +79,7 @@
<la:option value="14.8">14.8</la:option>
<la:option value="14.9">14.9</la:option>
<la:option value="14.10">14.10</la:option>
<la:option value="14.11">14.11</la:option>
</la:select>
</div>
</div>