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

fix #2534 add 13.10

Browse source
This commit is contained in:
Shinsuke Sugaya 2021-02-24 06:46:15 +09:00
parent 8294c76cd5
commit fcbd587bac
2 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,6 +82,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_13_9 = "13.9";
private static final String VERSION_13_10 = "13.10";
// ===================================================================================
// Attribute
//
@ -166,6 +168,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -193,6 +196,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -219,6 +223,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -244,6 +249,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -268,6 +274,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -291,6 +298,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -313,6 +321,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -333,6 +342,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -353,6 +363,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -372,6 +383,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -390,6 +402,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -407,6 +420,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -423,6 +437,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -438,6 +453,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -452,6 +468,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -465,6 +482,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -477,6 +495,7 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_13_9.equals(form.targetVersion)) {
try {
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -486,6 +505,18 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_9, e.getLocalizedMessage()));
}
} else if (VERSION_13_10.equals(form.targetVersion)) {
try {
upgradeFrom13_10();
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_10, e.getLocalizedMessage()));
}
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@ -573,6 +604,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
private void upgradeFrom13_10() {
// nothing
}
private void upgradeFromAll() {
// nothing
}

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

@ -68,6 +68,7 @@
<la:option value="13.7">13.7</la:option>
<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:select>
</div>
</div>